Compare commits

..

13 Commits

Author SHA1 Message Date
xiaoxian521
fd85ad0b45 chore: update 2025-04-09 18:42:44 +08:00
xiaoxian521
ff1c70e3c7 chore: update 2025-04-09 17:58:55 +08:00
xiaoxian521
c0d48a072e chore: update 2025-04-09 17:06:54 +08:00
xiaoxian521
fb3e6ea8d2 style: 样式再复查 2025-04-09 14:38:28 +08:00
xiaoxian521
b6529bf519 chore: update 2025-04-09 11:27:35 +08:00
xiaoxian521
22ce0f424e chore: update 2025-04-09 09:48:31 +08:00
xiaoxian521
1daeea0cbb Merge branch 'main' into refactor/tailwindcss 2025-04-09 07:32:08 +08:00
xiaoxian521
ed2a24f1e3 Merge branch 'main' into refactor/tailwindcss 2025-04-08 15:12:56 +08:00
xiaoxian521
b86d038a18 style: 样式复查 2025-04-08 14:37:20 +08:00
xiaoxian521
e3564eab96 chore: update 2025-03-28 15:06:27 +08:00
xiaoxian521
0a46a04c67 Merge branch 'main' into refactor/tailwindcss 2025-03-28 11:45:36 +08:00
xiaoxian521
b7d3dc1170 Merge branch 'main' into refactor/tailwindcss 2025-03-28 08:50:40 +08:00
xiaoxian521
ab1c7f8bcc refactor: 升级tailwindcssv4版本,带来更快的构建速度、更简化的安装和配置、提供专属vite插件 2025-03-16 19:46:35 +08:00
183 changed files with 3967 additions and 5135 deletions

View File

@@ -5,4 +5,4 @@
PATH="/usr/local/bin:$PATH" PATH="/usr/local/bin:$PATH"
pnpm dlx commitlint --edit "$1" npx --no-install commitlint --edit "$1"

2
.nvmrc
View File

@@ -1 +1 @@
v24.12.0 v22.14.0

View File

@@ -1,5 +1,4 @@
{ {
"tailwindCSS.experimental.configFile": "src/style/tailwind.css",
"editor.formatOnType": true, "editor.formatOnType": true,
"editor.formatOnSave": true, "editor.formatOnSave": true,
"[vue]": { "[vue]": {

View File

@@ -1,98 +1,8 @@
# 6.3.0 (2025-12-10)
### ✔️ Refactor
- Renamed "Overall Style" in system configuration to "Theme Mode" and "Navigation Mode" to "Menu Layout" to improve naming professionalism and clarity.
- Migrated the deprecated `tseslint.config` configuration method of `typescript-eslint`.
### 🎫 Feat
- Added a color picker panel component.
### 🐞 Bug fixes
- Fixed an issue where the selected/activated state style of the navigation menu was displayed incorrectly when using `iconfont` icons.
- Fixed a style issue with the column settings pop-up of the `RePureTableBar` and `ReVxeTableBar` components.
### 🍏 Perf
- Adapting the `ReDialog` component to the latest version of `el-dialog` with API changes and supplementary examples
- Adapting the `ReDrawer` component to the latest version of `el-drawer` with API changes and supplementary examples
- Adapting the `message` utility function to the latest version of `ElMessage` with API changes and supplementary examples
- Importing the latest version of `element-plus` components
- Optimizing the tab layout and style for Google Chrome mode
# 6.2.0 (2025-10-16)
### 🎫 Features
- Added full-screen `403`, `404`, and `500` error pages. These full-screen error pages are clear and secure, improving the user experience.
### 🐞 Bug Fixes
- Fixed an issue where the built-in homepage did not have a `name` configured, causing cache invalidation after setting the page cache.
- Fixed an issue where, in an embedded same-origin `iframe` page, when the `beforeunload` event was registered, right-clicking a tab and reloading it would cause the browser to prompt two confirmation blocks.
- Fixed an issue where pages with `keepAlive: true` set to cache invalidation when the initial load was slow.
- Fixed an issue where multiple tabs could be activated simultaneously when using the same parameters in different routes.
- Fixed an issue where the right-click menu on a tab displayed incorrectly when passing `params` parameters.
### 🍏 Perf
- Optimized the `nprogress` progress bar. It no longer displays when reloading a page or requesting an interface, improving the user experience.
- Optimized the timing of capturing all unmatched routes and redirecting to a full-screen `404` page.
- Explicitly configured the `Tailwind CSS` entry file path to improve the contextual recognition and prompting performance of the `Tailwind CSS IntelliSense` plugin
# 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
- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
### 🎫 Feat
- Add `Ai` chat component example
- Add `tagOnClick` tag to switch global public events
- Add code editor example
- Add `Markdown` example
- Add slider example
### 🐞 Bug fixes
- Fix `aria-hidden` error
- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
### 🍏 Perf
- Fix broken links in the waterfall infinite scrolling example
- Update `vue-flow`, related compatibility processing
- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
- Optimize `src/style/dark.scss` syntax
- Optimize login parameter transfer
- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
# 5.9.0 (2024-12-10) # 5.9.0 (2024-12-10)
### ✔Refactor ### ✔Refactor
- 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 - 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
- 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) - 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)
### 🎫Feat ### 🎫Feat

View File

@@ -1,98 +1,8 @@
# 6.3.0 (2025-12-10)
### ✔️ Refactor
- Renamed "Overall Style" in system configuration to "Theme Mode" and "Navigation Mode" to "Menu Layout" to improve naming professionalism and clarity.
- Migrated the deprecated `tseslint.config` configuration method of `typescript-eslint`.
### 🎫 Feat
- Added a color picker panel component.
### 🐞 Bug fixes
- Fixed an issue where the selected/activated state style of the navigation menu was displayed incorrectly when using `iconfont` icons.
- Fixed a style issue with the column settings pop-up of the `RePureTableBar` and `ReVxeTableBar` components.
### 🍏 Perf
- Adapting the `ReDialog` component to the latest version of `el-dialog` with API changes and supplementary examples
- Adapting the `ReDrawer` component to the latest version of `el-drawer` with API changes and supplementary examples
- Adapting the `message` utility function to the latest version of `ElMessage` with API changes and supplementary examples
- Importing the latest version of `element-plus` components
- Optimizing the tab layout and style for Google Chrome mode
# 6.2.0 (2025-10-16)
### 🎫 Features
- Added full-screen `403`, `404`, and `500` error pages. These full-screen error pages are clear and secure, improving the user experience.
### 🐞 Bug Fixes
- Fixed an issue where the built-in homepage did not have a `name` configured, causing cache invalidation after setting the page cache.
- Fixed an issue where, in an embedded same-origin `iframe` page, when the `beforeunload` event was registered, right-clicking a tab and reloading it would cause the browser to prompt two confirmation blocks.
- Fixed an issue where pages with `keepAlive: true` set to cache invalidation when the initial load was slow.
- Fixed an issue where multiple tabs could be activated simultaneously when using the same parameters in different routes.
- Fixed an issue where the right-click menu on a tab displayed incorrectly when passing `params` parameters.
### 🍏 Perf
- Optimized the `nprogress` progress bar. It no longer displays when reloading a page or requesting an interface, improving the user experience.
- Optimized the timing of capturing all unmatched routes and redirecting to a full-screen `404` page.
- Explicitly configured the `Tailwind CSS` entry file path to improve the contextual recognition and prompting performance of the `Tailwind CSS IntelliSense` plugin
# 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
- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
### 🎫 Feat
- Add `Ai` chat component example
- Add `tagOnClick` tag to switch global public events
- Add code editor example
- Add `Markdown` example
- Add slider example
### 🐞 Bug fixes
- Fix `aria-hidden` error
- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
### 🍏 Perf
- Fix broken links in the waterfall infinite scrolling example
- Update `vue-flow`, related compatibility processing
- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
- Optimize `src/style/dark.scss` syntax
- Optimize login parameter transfer
- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
# 5.9.0 (2024-12-10) # 5.9.0 (2024-12-10)
### ✔Refactor ### ✔Refactor
- 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 - 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
- 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) - 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)
### 🎫Feat ### 🎫Feat

View File

@@ -1,98 +1,8 @@
# 6.3.0 (2025-12-10)
### ✔️ Refactor
- 将系统配置中的“整体风格”更名为“主题模式”,“导航模式”更名为“菜单布局”,以提升命名的专业性与清晰度
- 迁移`typescript-eslint`已弃用的`tseslint.config`配置方式
### 🎫 Feat
- 添加颜色选择器面板组件
### 🐞 Bug fixes
- 修复导航菜单在使用`iconfont`图标时,选中/激活状态的样式显示异常问题
- 修复`RePureTableBar``ReVxeTableBar`组件的列设置弹窗样式问题
### 🍏 Perf
- `ReDialog`组件适配`el-dialog`最新版本的`API`变更以及补充相关示例
- `ReDrawer`组件适配`el-drawer`最新版本的`API`变更以及补充相关示例
- `message`工具函数适配`ElMessage`最新版本的`API`变更以及补充相关示例
- 导入`element-plus`最新版本的新组件
- 优化页签风格为谷歌模式下的布局和样式
# 6.2.0 (2025-10-16)
### 🎫 Feat
- 添加全屏`403``404``500`页面,全屏错误页面清晰且安全,提升用户体验
### 🐞 Bug fixes
- 修复内置的首页未设置`name`导致设置页面缓存后缓存无效的问题
- 修复在内嵌同源`iframe`页面中,当其注册了`beforeunload`事件时,右键标签页点击重新加载导致浏览器弹出两次确认拦截的问题
- 修复设置了`keepAlive: true`的页面在初次加载缓慢的情况下出现的页面缓存失效的问题
- 修复不同路由使用相同参数时,多个标签页会同时被激活的问题
- 修复`params`传参模式下标签页右键菜单显示不正确的问题
### 🍏 Perf
- 优化`nprogress`进度条,页面重进或接口请求时不再显示进度条,提升用户体验
- 优化当捕获所有未匹配路由并跳转全屏`404`页面的时机
- 显式配置`Tailwind CSS`入口文件路径,优化`Tailwind CSS IntelliSense`插件的上下文识别与提示性能
# 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
- 重构图标模块,使用`@iconify/json`替换不再维护更新的`@iconify-icons/*`依赖,优化使用体验,确保图标库可持续更新并支持`Tree-shaking`
- 升级`tailwindcss``v4`版本,带来更快的构建速度、更简化的安装和配置、提供专属`vite`插件
### 🎫 Feat
- 添加`Ai`聊天组件示例
- 添加`tagOnClick`标签切换全局公共事件
- 添加代码编辑器示例
- 添加`Markdown`示例
- 添加滑块示例
### 🐞 Bug fixes
- 修复`aria-hidden`报错
- 修复使用`this`语法时无法显示代码提示的问题并更新`pinia`相关语法
### 🍏 Perf
- 修复组件-瀑布流无限滚动示例中失效的链接
- 更新`vue-flow`,相关兼容处理
- 删除已弃用的依赖包`eslint-define-config`,升级`eslint`至最新版本,相关兼容处理
- 优化`src/style/dark.scss`语法
- 优化登录传参
- 使用`keydown`替换`keypress``keypress`事件已弃用
# 5.9.0 (2024-12-10) # 5.9.0 (2024-12-10)
### ✔️ Refactor ### ✔️ Refactor
- 升级`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版本用户`会享有一套更现代、美观且自定义程度高的主题色 - 升级`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版本用户`会享有一套更现代、美观且自定义程度高的主题色
- 使用 [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) 替换 [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector) - 使用 [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) 替换 [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
### 🎫 Feat ### 🎫 Feat
@@ -255,8 +165,8 @@
- 修复`windwos`下点击注册页面会出现滚动条问题 - 修复`windwos`下点击注册页面会出现滚动条问题
- 修复`windows`下页面切换,内容区会出现滚动条问题 - 修复`windows`下页面切换,内容区会出现滚动条问题
- 修复`pure-table`带状态表格在深色主题模式下状态样式消失的问题 - 修复`pure-table`带状态表格在深色整体风格下状态样式消失的问题
- 修复系统配置中开启灰色模式和深色主题模式,刷新页面主题模式异常 - 修复系统配置中开启灰色模式和深色整体风格,刷新页面整体风格异常
### 🍏 Perf ### 🍏 Perf
@@ -309,7 +219,7 @@
- 内嵌`iframe`页支持设置`keepAlive`,保持页面状态 - 内嵌`iframe`页支持设置`keepAlive`,保持页面状态
- 优化导航,弹出的菜单超出内容区自适应且可滚动 - 优化导航,弹出的菜单超出内容区自适应且可滚动
- 添加文件上传示例 - 添加文件上传示例
- 添加主题模式自适应操作系统浅色、深色、自动主题功能 - 添加整体风格自适应操作系统浅色、深色、自动主题功能
- 添加页脚 - 添加页脚
- 支持多标签页打开已经登录的系统后无需再登录并添加内免登录功能(用户可选择免登录的天数) - 支持多标签页打开已经登录的系统后无需再登录并添加内免登录功能(用户可选择免登录的天数)
- 带来高级感的终端命令行 - 带来高级感的终端命令行
@@ -509,7 +419,7 @@
- 修复菜单搜索功能弹框打开后搜索框未自动聚集的问题 - 修复菜单搜索功能弹框打开后搜索框未自动聚集的问题
- 修复按 `ESC` 退出全屏后,工具栏按钮文案展示问题 - 修复按 `ESC` 退出全屏后,工具栏按钮文案展示问题
- 修复移动端通知栏 `tooltip` 点击穿透问题 - 修复移动端通知栏 `tooltip` 点击穿透问题
- 修复当左侧菜单收起后,切换到 `horizontal` 菜单布局时文字不展示的问题 - 修复当左侧菜单收起后,切换到 `horizontal` 导航模式时文字不展示的问题
- 修复导航 `tab` 关闭其他标签页无法重置状态问题 - 修复导航 `tab` 关闭其他标签页无法重置状态问题
- 修复 `getHistoryMode` 函数中环境变量未初始化带来的页面热更新报错 - 修复 `getHistoryMode` 函数中环境变量未初始化带来的页面热更新报错
- 修复导航 `tab` 过多导致关闭左侧标签页无法正常显示 - 修复导航 `tab` 过多导致关闭左侧标签页无法正常显示

View File

@@ -31,10 +31,18 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
[Click me to view vue-pure-admin documentation](https://pure-admin.cn/) [Click me to view vue-pure-admin documentation](https://pure-admin.cn/)
[Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app) [Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
## Premium service ## Quality service, software outsourcing, sponsorship support
[Click me for details](https://pure-admin.cn/pages/service/) [Click me for details](https://pure-admin.cn/pages/service/)
## `js` version
[Click me to view js version](https://pure-admin.cn/pages/js/)
## `max` version
[Click me to view the max version](https://pure-admin.cn/pages/max/)
## Tauri ## Tauri
[Click Watch Tauri](https://github.com/pure-admin/tauri-pure-admin) [Click Watch Tauri](https://github.com/pure-admin/tauri-pure-admin)
@@ -184,7 +192,6 @@ Thank you very much for your in-depth understanding of the source code and your
| [edgexie](https://github.com/edgexie) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) | | [edgexie](https://github.com/edgexie) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
| [way-jm](https://github.com/way-jm) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) | | [way-jm](https://github.com/way-jm) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
| [simple-hui](https://github.com/simple-hui) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) | | [simple-hui](https://github.com/simple-hui) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
| [tinysimple](https://github.com/tinysimple) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple) |
## Git Contribution submission specification ## Git Contribution submission specification

View File

@@ -32,10 +32,18 @@
[点我查看 vue-pure-admin 文档](https://pure-admin.cn/) [点我查看 vue-pure-admin 文档](https://pure-admin.cn/)
[点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app) [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
## 高级服务 ## 优质服务、软件外包、赞助支持
[点我查看详情](https://pure-admin.cn/pages/service/) [点我查看详情](https://pure-admin.cn/pages/service/)
## `js` 版本
[点我查看 js 版本](https://pure-admin.cn/pages/js/)
## `max` 版本
[点我查看 max 版本](https://pure-admin.cn/pages/max/)
## `Tauri` 版本 ## `Tauri` 版本
[点我查看 Tauri 版本](https://github.com/pure-admin/tauri-pure-admin) [点我查看 Tauri 版本](https://github.com/pure-admin/tauri-pure-admin)
@@ -185,7 +193,6 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
| [edgexie](https://github.com/edgexie) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) | | [edgexie](https://github.com/edgexie) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie) |
| [way-jm](https://github.com/way-jm) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) | | [way-jm](https://github.com/way-jm) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm) |
| [simple-hui](https://github.com/simple-hui) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) | | [simple-hui](https://github.com/simple-hui) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui) |
| [tinysimple](https://github.com/tinysimple) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple) |
## `Git` 贡献提交规范 ## `Git` 贡献提交规范

View File

@@ -5,7 +5,6 @@ import * as parserVue from "vue-eslint-parser";
import configPrettier from "eslint-config-prettier"; import configPrettier from "eslint-config-prettier";
import pluginPrettier from "eslint-plugin-prettier"; import pluginPrettier from "eslint-plugin-prettier";
import { defineConfig, globalIgnores } from "eslint/config"; import { defineConfig, globalIgnores } from "eslint/config";
import eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
export default defineConfig([ export default defineConfig([
globalIgnores([ globalIgnores([
@@ -73,11 +72,8 @@ export default defineConfig([
] ]
} }
}, },
...tseslint.configs.recommended.map(config => ({ ...tseslint.config({
...config, extends: [...tseslint.configs.recommended],
files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"]
})),
{
files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"], files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
rules: { rules: {
"@typescript-eslint/no-redeclare": "error", "@typescript-eslint/no-redeclare": "error",
@@ -106,7 +102,7 @@ export default defineConfig([
} }
] ]
} }
}, }),
{ {
files: ["**/*.d.ts"], files: ["**/*.d.ts"],
rules: { rules: {
@@ -173,21 +169,5 @@ export default defineConfig([
} }
] ]
} }
},
{
files: ["**/*.vue", "**/*.tsx"],
plugins: {
"better-tailwindcss": eslintPluginBetterTailwindcss
},
rules: {
"better-tailwindcss/enforce-consistent-variable-syntax": "warn",
"better-tailwindcss/enforce-canonical-classes": "warn"
},
settings: {
"better-tailwindcss": {
entryPoint: "src/style/tailwind.css",
rootFontSize: 16
}
}
} }
]); ]);

View File

@@ -31,15 +31,15 @@ panel:
pureCloseSystemSet: Close System Configs pureCloseSystemSet: Close System Configs
pureClearCacheAndToLogin: Clear cache and return to login page pureClearCacheAndToLogin: Clear cache and return to login page
pureClearCache: Clear Cache pureClearCache: Clear Cache
pureThemeMode: Theme Mode pureOverallStyle: Overall Style
pureThemeModeLight: Light pureOverallStyleLight: Light
pureThemeModeLightTip: Set sail freshly and light up the comfortable work interface pureOverallStyleLightTip: Set sail freshly and light up the comfortable work interface
pureThemeModeDark: Dark pureOverallStyleDark: Dark
pureThemeModeDarkTip: Moonlight Overture, indulge in the tranquility and elegance of the night pureOverallStyleDarkTip: Moonlight Overture, indulge in the tranquility and elegance of the night
pureThemeModeSystem: Auto pureOverallStyleSystem: Auto
pureThemeModeSystemTip: Synchronize time, the interface naturally responds to morning and dusk pureOverallStyleSystemTip: Synchronize time, the interface naturally responds to morning and dusk
pureThemeColor: Theme Color pureThemeColor: Theme Color
pureMenuLayout: Menu Layout pureLayoutModel: Layout Model
pureVerticalTip: The menu on the left is familiar and friendly pureVerticalTip: The menu on the left is familiar and friendly
pureHorizontalTip: Top menu, concise overview pureHorizontalTip: Top menu, concise overview
pureMixTip: Mixed menu, flexible pureMixTip: Mixed menu, flexible
@@ -80,9 +80,9 @@ menus:
pureMarkdown: Markdown pureMarkdown: Markdown
pureEditor: Editor pureEditor: Editor
pureAbnormal: Abnormal Page pureAbnormal: Abnormal Page
purePageNotFound: "404" pureFourZeroFour: "404"
pureAccessDenied: "403" pureFourZeroOne: "403"
pureServerError: "500" pureFive: "500"
pureComponents: Components pureComponents: Components
pureDialog: Dialog pureDialog: Dialog
pureDrawer: Drawer pureDrawer: Drawer
@@ -108,7 +108,6 @@ menus:
pureTypeit: Typeit pureTypeit: Typeit
pureJsonEditor: JSON Editor pureJsonEditor: JSON Editor
pureColorPicker: Color Picker pureColorPicker: Color Picker
pureColorPickerPanel: Color PickerPanel
pureDatePicker: Date Picker pureDatePicker: Date Picker
pureDateTimePicker: DateTimePicker pureDateTimePicker: DateTimePicker
pureTimePicker: TimePicker pureTimePicker: TimePicker
@@ -239,18 +238,3 @@ login:
purePassWordSureReg: Please enter confirm password purePassWordSureReg: Please enter confirm password
purePassWordDifferentReg: The two passwords do not match! purePassWordDifferentReg: The two passwords do not match!
purePassWordUpdateReg: Password has been updated purePassWordUpdateReg: Password has been updated
pureLoginExpired: Login expired, please login again
tableBar:
pureList: List
pureLarge: Large
pureDefault: Default
pureSmall: Small
pureColumnSettings: ColumnSettings
pureCollapse: Collapse
pureExpand: Expand
pureRefresh: Refresh
pureDensity: Density
pureColumnDisplay: ColumnDisplay
pureReset: Reset
pureExitFullScreen: ExitFullScreen
pureFullScreen: FullScreen

View File

@@ -31,15 +31,15 @@ panel:
pureCloseSystemSet: 关闭配置 pureCloseSystemSet: 关闭配置
pureClearCacheAndToLogin: 清空缓存并返回登录页 pureClearCacheAndToLogin: 清空缓存并返回登录页
pureClearCache: 清空缓存 pureClearCache: 清空缓存
pureThemeMode: 主题模式 pureOverallStyle: 整体风格
pureThemeModeLight: 浅色 pureOverallStyleLight: 浅色
pureThemeModeLightTip: 清新启航,点亮舒适的工作界面 pureOverallStyleLightTip: 清新启航,点亮舒适的工作界面
pureThemeModeDark: 深色 pureOverallStyleDark: 深色
pureThemeModeDarkTip: 月光序曲,沉醉于夜的静谧雅致 pureOverallStyleDarkTip: 月光序曲,沉醉于夜的静谧雅致
pureThemeModeSystem: 自动 pureOverallStyleSystem: 自动
pureThemeModeSystemTip: 同步时光,界面随晨昏自然呼应 pureOverallStyleSystemTip: 同步时光,界面随晨昏自然呼应
pureThemeColor: 主题色 pureThemeColor: 主题色
pureMenuLayout: 菜单布局 pureLayoutModel: 导航模式
pureVerticalTip: 左侧菜单,亲切熟悉 pureVerticalTip: 左侧菜单,亲切熟悉
pureHorizontalTip: 顶部菜单,简洁概览 pureHorizontalTip: 顶部菜单,简洁概览
pureMixTip: 混合菜单,灵活多变 pureMixTip: 混合菜单,灵活多变
@@ -80,9 +80,9 @@ menus:
pureMarkdown: Markdown pureMarkdown: Markdown
pureEditor: 编辑器 pureEditor: 编辑器
pureAbnormal: 异常页面 pureAbnormal: 异常页面
purePageNotFound: "404" pureFourZeroFour: "404"
pureAccessDenied: "403" pureFourZeroOne: "403"
pureServerError: "500" pureFive: "500"
pureComponents: 组件 pureComponents: 组件
pureDialog: 函数式弹框 pureDialog: 函数式弹框
pureDrawer: 函数式抽屉 pureDrawer: 函数式抽屉
@@ -108,7 +108,6 @@ menus:
pureTypeit: 打字机 pureTypeit: 打字机
pureJsonEditor: JSON编辑器 pureJsonEditor: JSON编辑器
pureColorPicker: 颜色选择器 pureColorPicker: 颜色选择器
pureColorPickerPanel: 颜色选择器面板
pureDatePicker: 日期选择器 pureDatePicker: 日期选择器
pureDateTimePicker: 日期时间选择器 pureDateTimePicker: 日期时间选择器
pureTimePicker: 时间选择器 pureTimePicker: 时间选择器
@@ -239,18 +238,3 @@ login:
purePassWordSureReg: 请输入确认密码 purePassWordSureReg: 请输入确认密码
purePassWordDifferentReg: 两次密码不一致! purePassWordDifferentReg: 两次密码不一致!
purePassWordUpdateReg: 修改密码成功 purePassWordUpdateReg: 修改密码成功
pureLoginExpired: 登录已过期,请重新登录
tableBar:
pureList: 列表
pureLarge: 宽松
pureDefault: 默认
pureSmall: 紧凑
pureColumnSettings: 列设置
pureCollapse: 折叠
pureExpand: 展开
pureRefresh: 刷新
pureDensity: 密度
pureColumnDisplay: 列展示
pureReset: 重置
pureExitFullScreen: 退出全屏
pureFullScreen: 全屏

View File

@@ -326,8 +326,7 @@ export default defineFakeRoute([
method: "get", method: "get",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
systemManagementRouter, systemManagementRouter,
systemMonitorRouter, systemMonitorRouter,

View File

@@ -6,8 +6,7 @@ export default defineFakeRoute([
method: "post", method: "post",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list: [ list: [
{ {

View File

@@ -8,8 +8,7 @@ export default defineFakeRoute([
response: ({ body }) => { response: ({ body }) => {
if (body.username === "admin") { if (body.username === "admin") {
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
avatar: "https://avatars.githubusercontent.com/u/44761321", avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin", username: "admin",
@@ -25,8 +24,7 @@ export default defineFakeRoute([
}; };
} else { } else {
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
avatar: "https://avatars.githubusercontent.com/u/52823142", avatar: "https://avatars.githubusercontent.com/u/52823142",
username: "common", username: "common",

View File

@@ -33,8 +33,7 @@ export default defineFakeRoute([
method: "get", method: "get",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: mapList() data: mapList()
}; };
} }

View File

@@ -8,8 +8,7 @@ export default defineFakeRoute([
method: "get", method: "get",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
avatar: "https://avatars.githubusercontent.com/u/44761321", avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin", username: "admin",
@@ -47,8 +46,7 @@ export default defineFakeRoute([
} }
]; ];
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数

View File

@@ -8,8 +8,7 @@ export default defineFakeRoute([
response: ({ body }) => { response: ({ body }) => {
if (body.refreshToken) { if (body.refreshToken) {
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin", accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh", refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
@@ -19,8 +18,7 @@ export default defineFakeRoute([
}; };
} else { } else {
return { return {
code: 10001, success: false,
message: "请求参数缺失或格式不正确",
data: {} data: {}
}; };
} }

View File

@@ -50,8 +50,7 @@ export default defineFakeRoute([
if (body.phone) list = list.filter(item => item.phone === body.phone); if (body.phone) list = list.filter(item => item.phone === body.phone);
if (body.deptId) list = list.filter(item => item.dept.id === body.deptId); if (body.deptId) list = list.filter(item => item.dept.id === body.deptId);
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数
@@ -67,8 +66,7 @@ export default defineFakeRoute([
method: "get", method: "get",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
{ id: 1, name: "超级管理员" }, { id: 1, name: "超级管理员" },
{ id: 2, name: "普通角色" } { id: 2, name: "普通角色" }
@@ -84,21 +82,18 @@ export default defineFakeRoute([
if (body.userId) { if (body.userId) {
if (body.userId == 1) { if (body.userId == 1) {
return { return {
code: 0, success: true,
message: "操作成功",
data: [1] data: [1]
}; };
} else if (body.userId == 2) { } else if (body.userId == 2) {
return { return {
code: 0, success: true,
message: "操作成功",
data: [2] data: [2]
}; };
} }
} else { } else {
return { return {
code: 10001, success: false,
message: "请求参数缺失或格式不正确",
data: [] data: []
}; };
} }
@@ -135,8 +130,7 @@ export default defineFakeRoute([
); );
if (body.code) list = list.filter(item => item.code === body.code); if (body.code) list = list.filter(item => item.code === body.code);
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数
@@ -152,8 +146,7 @@ export default defineFakeRoute([
method: "post", method: "post",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
// 外部页面 // 外部页面
{ {
@@ -357,8 +350,7 @@ export default defineFakeRoute([
response: ({ body }) => { response: ({ body }) => {
if (body.id == 1) { if (body.id == 1) {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201,
202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403, 202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403,
@@ -367,8 +359,7 @@ export default defineFakeRoute([
}; };
} else if (body.id == 2) { } else if (body.id == 2) {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500,
501, 502, 503 501, 502, 503
@@ -383,8 +374,7 @@ export default defineFakeRoute([
method: "post", method: "post",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
// 外部页面 // 外部页面
{ {
@@ -1265,8 +1255,7 @@ export default defineFakeRoute([
method: "post", method: "post",
response: () => { response: () => {
return { return {
code: 0, success: true,
message: "操作成功",
data: [ data: [
{ {
name: "杭州总公司", name: "杭州总公司",
@@ -1429,8 +1418,7 @@ export default defineFakeRoute([
]; ];
list = list.filter(item => item.username.includes(body?.username)); list = list.filter(item => item.username.includes(body?.username));
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数
@@ -1474,8 +1462,7 @@ export default defineFakeRoute([
String(item.status).includes(String(body?.status)) String(item.status).includes(String(body?.status))
); );
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数
@@ -1521,8 +1508,7 @@ export default defineFakeRoute([
String(item.status).includes(String(body?.status)) String(item.status).includes(String(body?.status))
); );
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数
@@ -1580,8 +1566,7 @@ export default defineFakeRoute([
]; ];
list = list.filter(item => item.module.includes(body?.module)); list = list.filter(item => item.module.includes(body?.module));
return { return {
code: 0, success: true,
message: "操作成功",
data: { data: {
list, list,
total: list.length, // 总条目数 total: list.length, // 总条目数
@@ -1616,8 +1601,7 @@ export default defineFakeRoute([
"Content-Length": 17019 "Content-Length": 17019
}, },
responseBody: { responseBody: {
code: 0, success: true,
message: "操作成功",
data: [ data: [
{ {
parentId: 0, parentId: 0,

View File

@@ -1,6 +1,6 @@
{ {
"name": "vue-pure-admin", "name": "vue-pure-admin",
"version": "6.3.0", "version": "5.9.0",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
@@ -48,135 +48,134 @@
}, },
"dependencies": { "dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1", "@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.1.7", "@howdyjs/mouse-menu": "^2.1.6",
"@infectoone/vue-ganttastic": "^2.3.2", "@infectoone/vue-ganttastic": "^2.3.2",
"@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.3.0", "@pureadmin/table": "^3.2.1",
"@pureadmin/utils": "^2.6.3", "@pureadmin/utils": "^2.6.0",
"@vue-flow/background": "^1.3.2", "@vue-flow/background": "^1.3.2",
"@vue-flow/core": "^1.48.1", "@vue-flow/core": "^1.42.5",
"@vueuse/core": "^14.1.0", "@vueuse/core": "^13.1.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",
"@zxcvbn-ts/core": "^3.0.4", "@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"axios": "^1.13.2", "axios": "^1.8.4",
"china-area-data": "^5.0.1", "china-area-data": "^5.0.1",
"codemirror": "^5.65.20", "codemirror": "^5.65.19",
"codemirror-editor-vue3": "^2.8.0", "codemirror-editor-vue3": "^2.8.0",
"cropperjs": "^1.6.2", "cropperjs": "^1.6.2",
"dayjs": "^1.11.19", "dayjs": "^1.11.13",
"deep-chat": "^2.4.1", "deep-chat": "^2.1.1",
"echarts": "^6.0.0", "echarts": "^5.6.0",
"el-table-infinite-scroll": "^3.0.8", "el-table-infinite-scroll": "^3.0.6",
"element-plus": "^2.13.1", "element-plus": "^2.9.7",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
"intro.js": "^7.2.0", "intro.js": "^7.2.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"jsbarcode": "^3.12.3", "jsbarcode": "^3.11.6",
"localforage": "^1.10.0", "localforage": "^1.10.0",
"mint-filter": "^4.0.3", "mint-filter": "^4.0.3",
"mitt": "^3.0.1", "mitt": "^3.0.1",
"mqtt": "4.3.7", "mqtt": "4.3.7",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"path-browserify": "^1.0.1", "path-browserify": "^1.0.1",
"pinia": "^3.0.4", "pinia": "^3.0.1",
"pinyin-pro": "^3.27.0", "pinyin-pro": "^3.26.0",
"plus-pro-components": "^0.1.30", "plus-pro-components": "^0.1.22",
"qrcode": "^1.5.4", "qrcode": "^1.5.4",
"qs": "^6.14.1", "qs": "^6.14.0",
"responsive-storage": "^2.2.0", "responsive-storage": "^2.2.0",
"sortablejs": "^1.15.6", "sortablejs": "^1.15.6",
"swiper": "^12.0.3", "swiper": "^11.2.6",
"typeit": "^8.8.7", "typeit": "^8.8.7",
"v-contextmenu": "^3.2.0", "v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.2", "v3-infinite-loading": "^1.3.2",
"vditor": "^3.11.2", "vditor": "^3.10.9",
"version-rocket": "^1.7.4", "version-rocket": "^1.7.4",
"vue": "^3.5.26", "vue": "^3.5.13",
"vue-i18n": "^11.2.8", "vue-i18n": "^11.1.3",
"vue-json-pretty": "^2.6.0", "vue-json-pretty": "^2.4.0",
"vue-pdf-embed": "^2.1.3", "vue-pdf-embed": "^2.1.2",
"vue-router": "^4.6.4", "vue-router": "^4.5.0",
"vue-tippy": "^6.7.1", "vue-tippy": "^6.7.0",
"vue-types": "^6.0.0", "vue-types": "^6.0.0",
"vue-virtual-scroller": "2.0.0-beta.8", "vue-virtual-scroller": "2.0.0-beta.8",
"vue-waterfall-plugin-next": "^2.6.9", "vue-waterfall-plugin-next": "^2.6.5",
"vue3-danmaku": "^1.6.7", "vue3-danmaku": "^1.6.1",
"vue3-puzzle-vcode": "^1.1.7", "vue3-puzzle-vcode": "^1.1.7",
"vuedraggable": "^4.1.0", "vuedraggable": "^4.1.0",
"vxe-table": "4.6.25", "vxe-table": "4.6.25",
"wavesurfer.js": "^7.12.1", "wavesurfer.js": "^7.9.4",
"xgplayer": "^3.0.23", "xgplayer": "^3.0.21",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^20.3.1", "@commitlint/cli": "^19.8.0",
"@commitlint/config-conventional": "^20.3.1", "@commitlint/config-conventional": "^19.8.0",
"@commitlint/types": "^20.3.1", "@commitlint/types": "^19.8.0",
"@eslint/js": "^9.39.2", "@eslint/js": "^9.24.0",
"@faker-js/faker": "^10.2.0", "@faker-js/faker": "^9.6.0",
"@iconify/json": "^2.2.428", "@iconify/json": "^2.2.324",
"@iconify/vue": "4.2.0", "@iconify/vue": "4.2.0",
"@intlify/unplugin-vue-i18n": "^11.0.3", "@intlify/unplugin-vue-i18n": "^6.0.5",
"@tailwindcss/vite": "^4.1.18", "@tailwindcss/vite": "^4.1.3",
"@types/codemirror": "^5.60.17", "@types/codemirror": "^5.60.15",
"@types/dagre": "^0.7.53", "@types/dagre": "^0.7.52",
"@types/intro.js": "^5.1.5", "@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6", "@types/js-cookie": "^3.0.6",
"@types/node": "^20.19.30", "@types/node": "^20.17.30",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/path-browserify": "^1.0.3", "@types/path-browserify": "^1.0.3",
"@types/qrcode": "^1.5.6", "@types/qrcode": "^1.5.5",
"@types/qs": "^6.14.0", "@types/qs": "^6.9.18",
"@types/sortablejs": "^1.15.9", "@types/sortablejs": "^1.15.8",
"@vitejs/plugin-vue": "^6.0.3", "@vitejs/plugin-vue": "^5.2.3",
"@vitejs/plugin-vue-jsx": "^5.1.3", "@vitejs/plugin-vue-jsx": "^4.1.2",
"boxen": "^8.0.1", "boxen": "^8.0.1",
"code-inspector-plugin": "^1.3.4", "code-inspector-plugin": "^0.20.7",
"cssnano": "^7.1.2", "cssnano": "^7.0.6",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"eslint": "^9.39.2", "eslint": "^9.24.0",
"eslint-config-prettier": "^10.1.8", "eslint-config-prettier": "^10.1.1",
"eslint-plugin-better-tailwindcss": "^4.0.1", "eslint-plugin-prettier": "^5.2.6",
"eslint-plugin-prettier": "^5.5.5", "eslint-plugin-vue": "^10.0.0",
"eslint-plugin-vue": "^10.6.2",
"gradient-string": "^3.0.0", "gradient-string": "^3.0.0",
"husky": "^9.1.7", "husky": "^9.1.7",
"lint-staged": "^16.2.7", "lint-staged": "^15.5.0",
"postcss": "^8.5.6", "postcss": "^8.5.3",
"postcss-html": "^1.8.1", "postcss-html": "^1.8.0",
"postcss-load-config": "^6.0.1", "postcss-load-config": "^6.0.1",
"postcss-scss": "^4.0.9", "postcss-scss": "^4.0.9",
"prettier": "^3.8.0", "prettier": "^3.5.3",
"rimraf": "^6.1.2", "rimraf": "^6.0.1",
"rollup-plugin-visualizer": "^6.0.5", "rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.97.2", "sass": "^1.86.3",
"stylelint": "^17.0.0", "stylelint": "^16.18.0",
"stylelint-config-recess-order": "^7.4.0", "stylelint-config-recess-order": "^6.0.0",
"stylelint-config-recommended-vue": "^1.6.1", "stylelint-config-recommended-vue": "^1.6.0",
"stylelint-config-standard-scss": "^17.0.0", "stylelint-config-standard-scss": "^14.0.0",
"stylelint-prettier": "^5.0.3", "stylelint-prettier": "^5.0.3",
"svgo": "^4.0.0", "svgo": "^3.3.2",
"tailwindcss": "^4.1.18", "tailwindcss": "^4.1.3",
"typescript": "^5.9.3", "typescript": "^5.8.3",
"typescript-eslint": "^8.53.0", "typescript-eslint": "^8.29.1",
"unplugin-icons": "^23.0.1", "unplugin-icons": "^22.1.0",
"vite": "^7.3.1", "vite": "^6.2.5",
"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.2", "vite-plugin-fake-server": "^2.2.0",
"vite-plugin-remove-console": "^2.2.0", "vite-plugin-remove-console": "^2.2.0",
"vite-plugin-router-warn": "^2.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.1.3",
"vue-tsc": "^3.2.2" "vue-tsc": "^2.2.8"
}, },
"engines": { "engines": {
"node": "^20.19.0 || >=22.13.0", "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
"pnpm": ">=9" "pnpm": ">=9"
}, },
"pnpm": { "pnpm": {
@@ -201,10 +200,6 @@
"esbuild", "esbuild",
"typeit", "typeit",
"vue-demi" "vue-demi"
],
"ignoredBuiltDependencies": [
"@tailwindcss/oxide",
"vue3-danmaku"
] ]
} }
} }

6398
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
{ {
"Version": "6.3.0", "Version": "5.9.0",
"Title": "PureAdmin", "Title": "PureAdmin",
"FixedHeader": true, "FixedHeader": true,
"HiddenSideBar": false, "HiddenSideBar": false,
@@ -9,7 +9,7 @@
"Layout": "vertical", "Layout": "vertical",
"Theme": "light", "Theme": "light",
"DarkMode": false, "DarkMode": false,
"ThemeMode": "light", "OverallStyle": "light",
"Grey": false, "Grey": false,
"Weak": false, "Weak": false,
"HideTabs": false, "HideTabs": false,

View File

@@ -7,9 +7,8 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { useGlobal } from "@pureadmin/utils"; import { defineComponent } from "vue";
import { checkVersion } from "version-rocket"; import { checkVersion } from "version-rocket";
import { defineComponent, computed } from "vue";
import { ElConfigProvider } from "element-plus"; import { ElConfigProvider } from "element-plus";
import { ReDialog } from "@/components/ReDialog"; import { ReDialog } from "@/components/ReDialog";
import { ReDrawer } from "@/components/ReDrawer"; import { ReDrawer } from "@/components/ReDrawer";
@@ -25,16 +24,12 @@ export default defineComponent({
ReDialog, ReDialog,
ReDrawer ReDrawer
}, },
setup() { computed: {
const { $storage } = useGlobal<GlobalPropertiesApi>(); currentLocale() {
const currentLocale = computed(() => { return this.$storage.locale?.locale === "zh"
return $storage.locale?.locale === "zh"
? { ...zhCn, ...plusZhCn } ? { ...zhCn, ...plusZhCn }
: { ...en, ...plusEn }; : { ...en, ...plusEn };
}); }
return {
currentLocale
};
}, },
beforeCreate() { beforeCreate() {
const { version, name: title } = __APP_INFO__.pkg; const { version, name: title } = __APP_INFO__.pkg;

View File

@@ -1,8 +1,7 @@
import { http } from "@/utils/http"; import { http } from "@/utils/http";
type Result = { type Result = {
code: number; success: boolean;
message: string;
data?: { data?: {
/** 列表数据 */ /** 列表数据 */
list: Array<any>; list: Array<any>;

View File

@@ -1,8 +1,7 @@
import { http } from "@/utils/http"; import { http } from "@/utils/http";
type Result = { type Result = {
code: number; success: boolean;
message: string;
data: Array<any>; data: Array<any>;
}; };
@@ -15,7 +14,7 @@ export const mapJson = (params?: object) => {
export const formUpload = data => { export const formUpload = data => {
return http.request<Result>( return http.request<Result>(
"post", "post",
"https://pureadmin.free.beeceptor.com/images", "https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b",
{ data }, { data },
{ {
headers: { headers: {

View File

@@ -1,8 +1,7 @@
import { http } from "@/utils/http"; import { http } from "@/utils/http";
type Result = { type Result = {
code: number; success: boolean;
message: string;
data: Array<any>; data: Array<any>;
}; };

View File

@@ -1,14 +1,12 @@
import { http } from "@/utils/http"; import { http } from "@/utils/http";
type Result = { type Result = {
code: number; success: boolean;
message: string;
data?: Array<any>; data?: Array<any>;
}; };
type ResultTable = { type ResultTable = {
code: number; success: boolean;
message: string;
data?: { data?: {
/** 列表数据 */ /** 列表数据 */
list: Array<any>; list: Array<any>;

View File

@@ -1,8 +1,7 @@
import { http } from "@/utils/http"; import { http } from "@/utils/http";
export type UserResult = { export type UserResult = {
code: number; success: boolean;
message: string;
data: { data: {
/** 头像 */ /** 头像 */
avatar: string; avatar: string;
@@ -24,8 +23,7 @@ export type UserResult = {
}; };
export type RefreshTokenResult = { export type RefreshTokenResult = {
code: number; success: boolean;
message: string;
data: { data: {
/** `token` */ /** `token` */
accessToken: string; accessToken: string;
@@ -52,14 +50,12 @@ export type UserInfo = {
}; };
export type UserInfoResult = { export type UserInfoResult = {
code: number; success: boolean;
message: string;
data: UserInfo; data: UserInfo;
}; };
type ResultTable = { type ResultTable = {
code: number; success: boolean;
message: string;
data?: { data?: {
/** 列表数据 */ /** 列表数据 */
list: Array<any>; list: Array<any>;

File diff suppressed because one or more lines are too long

View File

@@ -23,15 +23,17 @@ const copyAnimatesList = cloneDeep(animatesList);
const animateClass = computed(() => { const animateClass = computed(() => {
return [ return [
"mt-1", "mt-1",
"flex-c", "flex",
"border", "border",
"w-32.5", "w-[130px]",
"h-25", "h-[100px]",
"items-center",
"cursor-pointer", "cursor-pointer",
"transition-all", "transition-all",
"justify-center",
"border-[#e5e7eb]", "border-[#e5e7eb]",
"hover:text-primary", "hover:text-primary",
"hover:duration-700" "hover:duration-[700ms]"
]; ];
}); });
@@ -86,7 +88,7 @@ function onMouseleave() {
@clear="onClear" @clear="onClear"
> >
<template #empty> <template #empty>
<div class="w-70"> <div class="w-[280px]">
<el-scrollbar <el-scrollbar
noresize noresize
height="212px" height="212px"

View File

@@ -116,10 +116,11 @@ export default defineComponent({
const iconClass = computed(() => { const iconClass = computed(() => {
return [ return [
"p-1.5", "p-[6px]",
"size-7.5", "h-[30px]",
"rounded-sm", "w-[30px]",
"outline-hidden", "outline-hidden",
"rounded-[4px]",
"cursor-pointer", "cursor-pointer",
"hover:bg-[rgba(0,0,0,0.06)]" "hover:bg-[rgba(0,0,0,0.06)]"
]; ];
@@ -251,7 +252,7 @@ export default defineComponent({
}, },
setup() { setup() {
return () => ( return () => (
<div class="flex flex-wrap w-15 justify-between"> <div class="flex flex-wrap w-[60px] justify-between">
<ElUpload <ElUpload
accept="image/*" accept="image/*"
show-file-list={false} show-file-list={false}

View File

@@ -54,7 +54,7 @@ defineExpose({ hidePopover });
</p> </p>
</div> </div>
</template> </template>
<div class="flex-c flex-wrap text-center"> <div class="flex flex-wrap justify-center items-center text-center">
<el-image <el-image
v-if="cropperImg" v-if="cropperImg"
:src="cropperImg" :src="cropperImg"

View File

@@ -123,7 +123,10 @@ function handleClose(
v-if="options?.fullscreenIcon || options?.headerRenderer" v-if="options?.fullscreenIcon || options?.headerRenderer"
#header="{ close, titleId, titleClass }" #header="{ close, titleId, titleClass }"
> >
<div v-if="options?.fullscreenIcon" class="flex-bc"> <div
v-if="options?.fullscreenIcon"
class="flex items-center justify-between"
>
<span :id="titleId" :class="titleClass">{{ options?.title }}</span> <span :id="titleId" :class="titleClass">{{ options?.title }}</span>
<i <i
v-if="!options?.fullscreen" v-if="!options?.fullscreen"

View File

@@ -35,20 +35,8 @@ type DialogProps = {
top?: string; top?: string;
/** 是否需要遮罩层,默认 `true` */ /** 是否需要遮罩层,默认 `true` */
modal?: boolean; modal?: boolean;
/** 是否允许穿透遮罩层,默认 `false`。使用时需将 `modal` 属性设置为 `false` */
modalPenetrable?: boolean;
/** 遮罩的自定义类名 */
modalClass?: string;
/** `header` 部分的自定义 `class` 名 */
headerClass?: string;
/** `body` 部分的自定义 `class` 名 */
bodyClass?: string;
/** `footer` 部分的自定义 `class` 名 */
footerClass?: string;
/** `Dialog` 自身是否插入至 `body` 元素上。嵌套的 `Dialog` 必须指定该属性并赋值为 `true`,默认 `false` */ /** `Dialog` 自身是否插入至 `body` 元素上。嵌套的 `Dialog` 必须指定该属性并赋值为 `true`,默认 `false` */
appendToBody?: boolean; appendToBody?: boolean;
/** `Dialog` 挂载到哪个 `DOM` 元素,该属性会覆盖 `append-to-body` 属性,默认 `body` */
appendTo?: string | HTMLElement;
/** 是否在 `Dialog` 出现时将 `body` 滚动锁定,默认 `true` */ /** 是否在 `Dialog` 出现时将 `body` 滚动锁定,默认 `true` */
lockScroll?: boolean; lockScroll?: boolean;
/** `Dialog` 的自定义类名 */ /** `Dialog` 的自定义类名 */
@@ -69,22 +57,12 @@ type DialogProps = {
beforeClose?: (done: DoneFn) => void; beforeClose?: (done: DoneFn) => void;
/** 为 `Dialog` 启用可拖拽功能,默认 `false` */ /** 为 `Dialog` 启用可拖拽功能,默认 `false` */
draggable?: boolean; draggable?: boolean;
/** 拖动范围可以超出可视区,默认 `false` */
overflow?: boolean;
/** 是否让 `Dialog` 的 `header` 和 `footer` 部分居中排列,默认 `false` */ /** 是否让 `Dialog` 的 `header` 和 `footer` 部分居中排列,默认 `false` */
center?: boolean; center?: boolean;
/** 是否水平垂直对齐对话框,默认 `false` */ /** 是否水平垂直对齐对话框,默认 `false` */
alignCenter?: boolean; alignCenter?: boolean;
/** 当关闭 `Dialog` 时,销毁其中的元素,默认 `false` */ /** 当关闭 `Dialog` 时,销毁其中的元素,默认 `false` */
destroyOnClose?: boolean; destroyOnClose?: boolean;
/** 自定义关闭图标,默认 `Close` */
closeIcon?: string | Component;
/** 和原生的 `CSS` 的 `z-index` 相同,改变 `z` 轴的顺序 */
zIndex?: number;
/** `header` 的 `aria-level` 属性 */
headerAriaLevel?: string;
/** 对话框动画的自定义过渡配置。可以是一个字符串(过渡名称),也可以是一个包含 `Vue` 过渡属性的对象,默认 `dialog-fade` */
transition?: string | object;
}; };
//element-plus.org/zh-CN/component/popconfirm.html#attributes //element-plus.org/zh-CN/component/popconfirm.html#attributes

View File

@@ -6,6 +6,7 @@ type ArgsType = {
/** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了 `esc` 键 */ /** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了 `esc` 键 */
command: "cancel" | "sure" | "close"; command: "cancel" | "sure" | "close";
}; };
type ButtonType = type ButtonType =
| "primary" | "primary"
| "success" | "success"
@@ -19,11 +20,11 @@ type DrawerProps = {
visible?: boolean; visible?: boolean;
/** `Drawer` 自身是否插入至 `body` 元素上。嵌套的 `Drawer` 必须指定该属性并赋值为 `true`,默认 `false` */ /** `Drawer` 自身是否插入至 `body` 元素上。嵌套的 `Drawer` 必须指定该属性并赋值为 `true`,默认 `false` */
appendToBody?: boolean; appendToBody?: boolean;
/** 挂载到哪个 `DOM` 元素,会覆盖 `appendToBody` 属性,默认 `body` */ /** 挂载到哪个 `DOM` 元素覆盖 `appendToBody` */
appendTo?: string; appendTo?: string;
/** 是否在 `Drawer` 出现时将 `body` 滚动锁定,默认 `true` */ /** 是否在 `Drawer` 出现时将 `body` 滚动锁定,默认 `true` */
lockScroll?: boolean; lockScroll?: boolean;
/** 关闭前的回调,会暂停 `Drawer` 的关闭回调函数内执行 `done` 参数方法的时候才是真正关闭对话框的时候 */ /** 关闭前的回调,会暂停 `Drawer` 的关闭 回调函数内执行 `done` 参数方法的时候才是真正关闭对话框的时候 */
beforeClose?: (done: DoneFn) => void; beforeClose?: (done: DoneFn) => void;
/** 是否可以通过点击 `modal` 关闭 `Drawer` ,默认 `true` */ /** 是否可以通过点击 `modal` 关闭 `Drawer` ,默认 `true` */
closeOnClickModal?: boolean; closeOnClickModal?: boolean;
@@ -43,13 +44,9 @@ type DrawerProps = {
destroyOnClose?: boolean; destroyOnClose?: boolean;
/** 是否需要遮罩层,默认 `true` */ /** 是否需要遮罩层,默认 `true` */
modal?: boolean; modal?: boolean;
/** 是否允许穿透遮罩层,默认 `false`。使用时需将 `modal` 属性设置为 `false` */
modalPenetrable?: boolean;
/** `Drawer` 打开的方向,默认 `rtl` */ /** `Drawer` 打开的方向,默认 `rtl` */
direction?: "rtl" | "ltr" | "ttb" | "btt"; direction?: "rtl" | "ltr" | "ttb" | "btt";
/** 是否启用可调整大小的功能,默认 `false` */ /** `Drawer` 窗体的大小, 当使用 `number` 类型时, 以像素为单位, 当使用 `string` 类型时, 请传入 `'x%'`, 否则便会以 `number` 类型解释 */
resizable?: boolean;
/** `Drawer` 窗体的大小, 当使用 `number` 类型时, 以像素为单位, 当使用 `string` 类型时, 请传入 `'x%'`, 否则便会以 `number` 类型解释,默认 `30%` */
size?: string | number; size?: string | number;
/** `Drawer` 的标题 */ /** `Drawer` 的标题 */
title?: string; title?: string;
@@ -57,12 +54,6 @@ type DrawerProps = {
withHeader?: boolean; withHeader?: boolean;
/** 遮罩层的自定义类名 */ /** 遮罩层的自定义类名 */
modalClass?: string; modalClass?: string;
/** `header` 部分的自定义 `class` 名 */
headerClass?: string;
/** `body` 部分的自定义 `class` 名 */
bodyClass?: string;
/** `footer` 部分的自定义 `class` 名 */
footerClass?: string;
/** 设置 `z-index` */ /** 设置 `z-index` */
zIndex?: number; zIndex?: number;
/** `header` 的 `aria-level` 属性,默认 `2` */ /** `header` 的 `aria-level` 属性,默认 `2` */

View File

@@ -23,9 +23,9 @@
function h() { function h() {
n || ((n = !0), o()); n || ((n = !0), o());
} }
((t = function () { (t = function () {
var c, t, e, o; var c, t, e, o;
(((o = document.createElement("div")).innerHTML = i), ((o = document.createElement("div")).innerHTML = i),
(i = null), (i = null),
(e = o.getElementsByTagName("svg")[0]) && (e = o.getElementsByTagName("svg")[0]) &&
((e.style.position = "absolute"), ((e.style.position = "absolute"),
@@ -35,13 +35,13 @@
(c = e), (c = e),
(t = document.body).firstChild (t = document.body).firstChild
? ((o = c), (e = t.firstChild).parentNode.insertBefore(o, e)) ? ((o = c), (e = t.firstChild).parentNode.insertBefore(o, e))
: t.appendChild(c))); : t.appendChild(c));
}), }),
document.addEventListener document.addEventListener
? ~["complete", "loaded", "interactive"].indexOf(document.readyState) ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
? setTimeout(t, 0) ? setTimeout(t, 0)
: ((e = function () { : ((e = function () {
(document.removeEventListener("DOMContentLoaded", e, !1), t()); document.removeEventListener("DOMContentLoaded", e, !1), t();
}), }),
document.addEventListener("DOMContentLoaded", e, !1)) document.addEventListener("DOMContentLoaded", e, !1))
: document.attachEvent && : document.attachEvent &&
@@ -58,5 +58,5 @@
})(), })(),
(a.onreadystatechange = function () { (a.onreadystatechange = function () {
"complete" == a.readyState && ((a.onreadystatechange = null), h()); "complete" == a.readyState && ((a.onreadystatechange = null), h());
}))); }));
})(window); })(window);

View File

@@ -135,7 +135,9 @@ watch(
@after-leave="onAfterLeave" @after-leave="onAfterLeave"
> >
<template #reference> <template #reference>
<div class="w-10 h-8 cursor-pointer flex-c"> <div
class="w-[40px] h-[32px] cursor-pointer flex justify-center items-center"
>
<IconifyIconOffline v-if="!icon" :icon="Search" /> <IconifyIconOffline v-if="!icon" :icon="Search" />
<IconifyIconOnline v-else :icon="inputValue" /> <IconifyIconOnline v-else :icon="inputValue" />
</div> </div>
@@ -161,7 +163,7 @@ watch(
v-for="(item, key) in pageList" v-for="(item, key) in pageList"
:key="key" :key="key"
:title="item" :title="item"
class="icon-item p-2 cursor-pointer mr-2 mt-1 flex-c border border-[#e5e7eb]" class="icon-item p-2 cursor-pointer mr-2 mt-1 flex justify-center items-center border border-[#e5e7eb]"
:style="iconItemStyle(item)" :style="iconItemStyle(item)"
@click="onChangeIcon(item)" @click="onChangeIcon(item)"
> >

View File

@@ -92,16 +92,14 @@ onBeforeMount(() => {
// 获取模拟车辆信息 // 获取模拟车辆信息
mapJson() mapJson()
.then(({ code, data }) => { .then(({ data }) => {
if (code === 0) { const points: object = data.map(v => {
const points: object = data.map(v => { return {
return { lnglat: [v.lng, v.lat],
lnglat: [v.lng, v.lat], ...v
...v };
}; });
}); if (MarkerCluster) MarkerCluster.setData(points);
if (MarkerCluster) MarkerCluster.setData(points);
}
}) })
.catch(err => { .catch(err => {
console.log("err:", err); console.log("err:", err);

View File

@@ -1,5 +1,5 @@
import Sortable from "sortablejs"; import Sortable from "sortablejs";
import { $t, transformI18n } from "@/plugins/i18n"; import { transformI18n } from "@/plugins/i18n";
import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { import {
type PropType, type PropType,
@@ -30,7 +30,7 @@ const props = {
/** 头部最左边的标题 */ /** 头部最左边的标题 */
title: { title: {
type: String, type: String,
default: $t("tableBar.pureList") default: "列表"
}, },
/** 对于树形表格如果想启用展开和折叠功能传入当前表格的ref即可 */ /** 对于树形表格如果想启用展开和折叠功能传入当前表格的ref即可 */
tableRef: { tableRef: {
@@ -97,10 +97,10 @@ export default defineComponent({
return [ return [
"flex", "flex",
"justify-between", "justify-between",
"pt-0.75", "pt-[3px]",
"px-2.75", "px-[11px]",
"border-b", "border-b-[1px]",
"border-b-solid", "border-solid",
"border-[#dcdfe6]", "border-[#dcdfe6]",
"dark:border-[#303030]" "dark:border-[#303030]"
]; ];
@@ -169,19 +169,19 @@ export default defineComponent({
style={getDropdownItemStyle.value("large")} style={getDropdownItemStyle.value("large")}
onClick={() => (size.value = "large")} onClick={() => (size.value = "large")}
> >
{transformI18n($t("tableBar.pureLarge"))}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
style={getDropdownItemStyle.value("default")} style={getDropdownItemStyle.value("default")}
onClick={() => (size.value = "default")} onClick={() => (size.value = "default")}
> >
{transformI18n($t("tableBar.pureDefault"))}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
style={getDropdownItemStyle.value("small")} style={getDropdownItemStyle.value("small")}
onClick={() => (size.value = "small")} onClick={() => (size.value = "small")}
> >
{transformI18n($t("tableBar.pureSmall"))}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
) )
@@ -244,10 +244,8 @@ export default defineComponent({
const reference = { const reference = {
reference: () => ( reference: () => (
<SettingIcon <SettingIcon
class={["w-4", iconClass.value]} class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps( v-tippy={rendTippyProps("列设置")}
transformI18n($t("tableBar.pureColumnSettings"))
)}
/> />
) )
}; };
@@ -266,27 +264,25 @@ export default defineComponent({
: "mt-2" : "mt-2"
]} ]}
> >
<div class="flex justify-between w-full h-15 p-4"> <div class="flex justify-between w-full h-[60px] p-4">
{slots?.title ? ( {slots?.title ? (
slots.title() slots.title()
) : ( ) : (
<p class="font-bold truncate">{transformI18n(props.title)}</p> <p class="font-bold truncate">{props.title}</p>
)} )}
<div class="flex-ac"> <div class="flex items-center justify-around">
{slots?.buttons ? ( {slots?.buttons ? (
<div class="flex mr-4">{slots.buttons()}</div> <div class="flex mr-4">{slots.buttons()}</div>
) : null} ) : null}
{props.tableRef?.size ? ( {props.tableRef?.size ? (
<> <>
<ExpandIcon <ExpandIcon
class={["w-4", iconClass.value]} class={["w-[16px]", iconClass.value]}
style={{ style={{
transform: isExpandAll.value ? "none" : "rotate(-90deg)" transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}} }}
v-tippy={rendTippyProps( v-tippy={rendTippyProps(
isExpandAll.value isExpandAll.value ? "折叠" : "展开"
? transformI18n($t("tableBar.pureCollapse"))
: transformI18n($t("tableBar.pureExpand"))
)} )}
onClick={() => onExpand()} onClick={() => onExpand()}
/> />
@@ -295,24 +291,20 @@ export default defineComponent({
) : null} ) : null}
<RefreshIcon <RefreshIcon
class={[ class={[
"w-4", "w-[16px]",
iconClass.value, iconClass.value,
loading.value ? "animate-spin" : "" loading.value ? "animate-spin" : ""
]} ]}
v-tippy={rendTippyProps( v-tippy={rendTippyProps("刷新")}
transformI18n($t("tableBar.pureRefresh"))
)}
onClick={() => onReFresh()} onClick={() => onReFresh()}
/> />
<el-divider direction="vertical" /> <el-divider direction="vertical" />
<el-dropdown <el-dropdown
v-slots={dropdown} v-slots={dropdown}
trigger="click" trigger="click"
v-tippy={rendTippyProps( v-tippy={rendTippyProps("密度")}
transformI18n($t("tableBar.pureDensity"))
)}
> >
<CollapseIcon class={["w-4", iconClass.value]} /> <CollapseIcon class={["w-[16px]", iconClass.value]} />
</el-dropdown> </el-dropdown>
<el-divider direction="vertical" /> <el-divider direction="vertical" />
@@ -326,17 +318,17 @@ export default defineComponent({
<div class={[topClass.value]}> <div class={[topClass.value]}>
<el-checkbox <el-checkbox
class="-mr-1!" class="-mr-1!"
label={transformI18n($t("tableBar.pureColumnDisplay"))} label="列展示"
v-model={checkAll.value} v-model={checkAll.value}
indeterminate={isIndeterminate.value} indeterminate={isIndeterminate.value}
onChange={value => handleCheckAllChange(value)} onChange={value => handleCheckAllChange(value)}
/> />
<el-button type="primary" link onClick={() => onReset()}> <el-button type="primary" link onClick={() => onReset()}>
{transformI18n($t("tableBar.pureReset"))}
</el-button> </el-button>
</div> </div>
<div class="pt-1.5 pl-2.75"> <div class="pt-[6px] pl-[11px]">
<el-scrollbar max-height="36vh"> <el-scrollbar max-height="36vh">
<el-checkbox-group <el-checkbox-group
ref={`GroupRef${unref(props.tableKey)}`} ref={`GroupRef${unref(props.tableKey)}`}
@@ -353,7 +345,7 @@ export default defineComponent({
<div class="flex items-center"> <div class="flex items-center">
<DragIcon <DragIcon
class={[ class={[
"drag-btn w-4 mr-2", "drag-btn w-[16px] mr-2",
isFixedColumn(item) isFixedColumn(item)
? "cursor-no-drop!" ? "cursor-no-drop!"
: "cursor-grab!" : "cursor-grab!"
@@ -372,7 +364,7 @@ export default defineComponent({
> >
<span <span
title={transformI18n(item)} title={transformI18n(item)}
class="inline-block w-30 truncate hover:text-text_color_primary" class="inline-block w-[120px] truncate hover:text-text_color_primary"
> >
{transformI18n(item)} {transformI18n(item)}
</span> </span>
@@ -388,13 +380,9 @@ export default defineComponent({
<el-divider direction="vertical" /> <el-divider direction="vertical" />
<iconifyIconOffline <iconifyIconOffline
class={["w-4", iconClass.value]} class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen} icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={ v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
isFullscreen.value
? transformI18n($t("tableBar.pureExitFullScreen"))
: transformI18n($t("tableBar.pureFullScreen"))
}
onClick={() => onFullscreen()} onClick={() => onFullscreen()}
/> />
</div> </div>

View File

@@ -240,7 +240,7 @@ export default defineComponent({
)} )}
{props.disabled && ( {props.disabled && (
<div <div
class="qrcode--disabled absolute top-0 left-0 flex-c size-full" class="qrcode--disabled absolute top-0 left-0 flex w-full h-full items-center justify-center"
onClick={disabledClick} onClick={disabledClick}
> >
<div class="absolute top-[50%] left-[50%] font-bold"> <div class="absolute top-[50%] left-[50%] font-bold">

View File

@@ -5,10 +5,14 @@ import {
ref, ref,
unref, unref,
nextTick, nextTick,
computed, computed
useTemplateRef
} from "vue"; } from "vue";
import { tryOnMounted, tryOnUnmounted, useDebounceFn } from "@vueuse/core"; import {
tryOnMounted,
tryOnUnmounted,
templateRef,
useDebounceFn
} from "@vueuse/core";
import * as utilsMethods from "./utils"; import * as utilsMethods from "./utils";
const { animationFrame, copyObj } = utilsMethods; const { animationFrame, copyObj } = utilsMethods;
animationFrame(); animationFrame();
@@ -58,14 +62,17 @@ if (props.classOption["key"] === undefined) {
props.classOption["key"] = 0; props.classOption["key"] = 0;
} }
const wrap = useTemplateRef<HTMLElement | null>( const wrap = templateRef<HTMLElement | null>(
`wrap${props.classOption["key"]}` `wrap${props.classOption["key"]}`,
null
); );
const slotList = useTemplateRef<HTMLElement | null>( const slotList = templateRef<HTMLElement | null>(
`slotList${props.classOption["key"]}` `slotList${props.classOption["key"]}`,
null
); );
const realBox = useTemplateRef<HTMLElement | null>( const realBox = templateRef<HTMLElement | null>(
`realBox${props.classOption["key"]}` `realBox${props.classOption["key"]}`,
null
); );
const leftSwitchState = computed(() => { const leftSwitchState = computed(() => {

View File

@@ -98,6 +98,7 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
transition: 0.1s;
} }
.pure-segmented-group { .pure-segmented-group {

View File

@@ -33,10 +33,10 @@
} }
l(); l();
} }
((t = function () { (t = function () {
var e, var e,
t = document.createElement("div"); t = document.createElement("div");
((t.innerHTML = i), (t.innerHTML = i),
(i = null), (i = null),
(t = t.getElementsByTagName("svg")[0]) && (t = t.getElementsByTagName("svg")[0]) &&
((t.style.position = "absolute"), ((t.style.position = "absolute"),
@@ -44,15 +44,13 @@
(t.style.height = 0), (t.style.height = 0),
(t.style.overflow = "hidden"), (t.style.overflow = "hidden"),
(t = t), (t = t),
(e = document.body).firstChild (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
? m(t, e.firstChild)
: e.appendChild(t)));
}), }),
document.addEventListener document.addEventListener
? ~["complete", "loaded", "interactive"].indexOf(document.readyState) ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
? setTimeout(t, 0) ? setTimeout(t, 0)
: ((n = function () { : ((n = function () {
(document.removeEventListener("DOMContentLoaded", n, !1), t()); document.removeEventListener("DOMContentLoaded", n, !1), t();
}), }),
document.addEventListener("DOMContentLoaded", n, !1)) document.addEventListener("DOMContentLoaded", n, !1))
: document.attachEvent && : document.attachEvent &&
@@ -62,5 +60,5 @@
a(), a(),
(o.onreadystatechange = function () { (o.onreadystatechange = function () {
"complete" == o.readyState && ((o.onreadystatechange = null), l()); "complete" == o.readyState && ((o.onreadystatechange = null), l());
}))); }));
})(window); })(window);

View File

@@ -1,5 +1,5 @@
import Sortable from "sortablejs"; import Sortable from "sortablejs";
import { $t, transformI18n } from "@/plugins/i18n"; import { transformI18n } from "@/plugins/i18n";
import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { delay, cloneDeep, getKeyList } from "@pureadmin/utils"; import { delay, cloneDeep, getKeyList } from "@pureadmin/utils";
import { import {
@@ -24,7 +24,7 @@ const props = {
/** 头部最左边的标题 */ /** 头部最左边的标题 */
title: { title: {
type: String, type: String,
default: $t("tableBar.pureList") default: "列表"
}, },
vxeTableRef: { vxeTableRef: {
type: Object as PropType<any> type: Object as PropType<any>
@@ -90,10 +90,10 @@ export default defineComponent({
return [ return [
"flex", "flex",
"justify-between", "justify-between",
"pt-0.75", "pt-[3px]",
"px-2.75", "px-[11px]",
"border-b", "border-b-[1px]",
"border-b-solid", "border-solid",
"border-[#dcdfe6]", "border-[#dcdfe6]",
"dark:border-[#303030]" "dark:border-[#303030]"
]; ];
@@ -161,19 +161,19 @@ export default defineComponent({
style={getDropdownItemStyle.value("medium")} style={getDropdownItemStyle.value("medium")}
onClick={() => changeSize("medium")} onClick={() => changeSize("medium")}
> >
{transformI18n($t("tableBar.pureLarge"))}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
style={getDropdownItemStyle.value("small")} style={getDropdownItemStyle.value("small")}
onClick={() => changeSize("small")} onClick={() => changeSize("small")}
> >
{transformI18n($t("tableBar.pureDefault"))}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
style={getDropdownItemStyle.value("mini")} style={getDropdownItemStyle.value("mini")}
onClick={() => changeSize("mini")} onClick={() => changeSize("mini")}
> >
{transformI18n($t("tableBar.pureSmall"))}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
) )
@@ -237,10 +237,8 @@ export default defineComponent({
const reference = { const reference = {
reference: () => ( reference: () => (
<SettingIcon <SettingIcon
class={["w-4", iconClass.value]} class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps( v-tippy={rendTippyProps("列设置")}
transformI18n($t("tableBar.pureColumnSettings"))
)}
/> />
) )
}; };
@@ -259,27 +257,25 @@ export default defineComponent({
: "mt-2" : "mt-2"
]} ]}
> >
<div class="flex justify-between w-full h-15 p-4"> <div class="flex justify-between w-full h-[60px] p-4">
{slots?.title ? ( {slots?.title ? (
slots.title() slots.title()
) : ( ) : (
<p class="font-bold truncate">{transformI18n(props.title)}</p> <p class="font-bold truncate">{props.title}</p>
)} )}
<div class="flex-ac"> <div class="flex items-center justify-around">
{slots?.buttons ? ( {slots?.buttons ? (
<div class="flex mr-4">{slots.buttons()}</div> <div class="flex mr-4">{slots.buttons()}</div>
) : null} ) : null}
{props.tree ? ( {props.tree ? (
<> <>
<ExpandIcon <ExpandIcon
class={["w-4", iconClass.value]} class={["w-[16px]", iconClass.value]}
style={{ style={{
transform: isExpandAll.value ? "none" : "rotate(-90deg)" transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}} }}
v-tippy={rendTippyProps( v-tippy={rendTippyProps(
isExpandAll.value isExpandAll.value ? "折叠" : "展开"
? transformI18n($t("tableBar.pureCollapse"))
: transformI18n($t("tableBar.pureExpand"))
)} )}
onClick={() => onExpand()} onClick={() => onExpand()}
/> />
@@ -288,24 +284,20 @@ export default defineComponent({
) : null} ) : null}
<RefreshIcon <RefreshIcon
class={[ class={[
"w-4", "w-[16px]",
iconClass.value, iconClass.value,
loading.value ? "animate-spin" : "" loading.value ? "animate-spin" : ""
]} ]}
v-tippy={rendTippyProps( v-tippy={rendTippyProps("刷新")}
transformI18n($t("tableBar.pureRefresh"))
)}
onClick={() => onReFresh()} onClick={() => onReFresh()}
/> />
<el-divider direction="vertical" /> <el-divider direction="vertical" />
<el-dropdown <el-dropdown
v-slots={dropdown} v-slots={dropdown}
trigger="click" trigger="click"
v-tippy={rendTippyProps( v-tippy={rendTippyProps("密度")}
transformI18n($t("tableBar.pureDensity"))
)}
> >
<CollapseIcon class={["w-4", iconClass.value]} /> <CollapseIcon class={["w-[16px]", iconClass.value]} />
</el-dropdown> </el-dropdown>
<el-divider direction="vertical" /> <el-divider direction="vertical" />
@@ -319,17 +311,17 @@ export default defineComponent({
<div class={[topClass.value]}> <div class={[topClass.value]}>
<el-checkbox <el-checkbox
class="-mr-1!" class="-mr-1!"
label={transformI18n($t("tableBar.pureColumnDisplay"))} label="列展示"
v-model={checkAll.value} v-model={checkAll.value}
indeterminate={isIndeterminate.value} indeterminate={isIndeterminate.value}
onChange={value => handleCheckAllChange(value)} onChange={value => handleCheckAllChange(value)}
/> />
<el-button type="primary" link onClick={() => onReset()}> <el-button type="primary" link onClick={() => onReset()}>
{transformI18n($t("tableBar.pureReset"))}
</el-button> </el-button>
</div> </div>
<div class="pt-1.5 pl-2.75"> <div class="pt-[6px] pl-[11px]">
<el-scrollbar max-height="36vh"> <el-scrollbar max-height="36vh">
<el-checkbox-group <el-checkbox-group
ref={`VxeGroupRef${unref(props.tableKey)}`} ref={`VxeGroupRef${unref(props.tableKey)}`}
@@ -346,7 +338,7 @@ export default defineComponent({
<div class="flex items-center"> <div class="flex items-center">
<DragIcon <DragIcon
class={[ class={[
"drag-btn w-4 mr-2", "drag-btn w-[16px] mr-2",
isFixedColumn(item) isFixedColumn(item)
? "cursor-no-drop!" ? "cursor-no-drop!"
: "cursor-grab!" : "cursor-grab!"
@@ -363,7 +355,7 @@ export default defineComponent({
> >
<span <span
title={transformI18n(item)} title={transformI18n(item)}
class="inline-block w-30 truncate hover:text-text_color_primary" class="inline-block w-[120px] truncate hover:text-text_color_primary"
> >
{transformI18n(item)} {transformI18n(item)}
</span> </span>
@@ -379,13 +371,9 @@ export default defineComponent({
<el-divider direction="vertical" /> <el-divider direction="vertical" />
<iconifyIconOffline <iconifyIconOffline
class={["w-4", iconClass.value]} class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen} icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={ v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
isFullscreen.value
? transformI18n($t("tableBar.pureExitFullScreen"))
: transformI18n($t("tableBar.pureFullScreen"))
}
onClick={() => onFullscreen()} onClick={() => onFullscreen()}
/> />
</div> </div>

View File

@@ -13,10 +13,10 @@ $ripple-animation-visible-opacity: 0.25 !default;
z-index: 0; z-index: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
contain: strict;
overflow: hidden; overflow: hidden;
pointer-events: none; pointer-events: none;
border-radius: inherit; border-radius: inherit;
contain: strict;
} }
&__animation { &__animation {

View File

@@ -10,10 +10,8 @@ export interface RippleOptions {
circle?: boolean; circle?: boolean;
} }
export interface RippleDirectiveBinding extends Omit< export interface RippleDirectiveBinding
DirectiveBinding, extends Omit<DirectiveBinding, "modifiers" | "value"> {
"modifiers" | "value"
> {
value?: boolean | { class: string }; value?: boolean | { class: string };
modifiers: { modifiers: {
center?: boolean; center?: boolean;

View File

@@ -10,7 +10,7 @@ const TITLE = getConfig("Title");
> >
Copyright © 2020-present 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"
target="_blank" target="_blank"
> >

View File

@@ -65,7 +65,7 @@ watch(
</script> </script>
<template> <template>
<template v-for="[fullPath, Comp] in compList" :key="fullPath"> <template v-for="[fullPath, Comp] in compList" :key="fullPath">
<div v-show="fullPath === currRoute.fullPath" class="size-full"> <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
<slot <slot
:fullPath="fullPath" :fullPath="fullPath"
:Comp="Comp" :Comp="Comp"
@@ -73,7 +73,7 @@ watch(
/> />
</div> </div>
</template> </template>
<div v-show="!keep" class="size-full"> <div v-show="!keep" class="w-full h-full">
<slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo /> <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
</div> </div>
</template> </template>

View File

@@ -33,7 +33,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</script> </script>
<template> <template>
<div class="navbar bg-white shadow-xs shadow-[rgba(0,21,41,0.08)]"> <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
<LaySidebarTopCollapse <LaySidebarTopCollapse
v-if="device === 'mobile'" v-if="device === 'mobile'"
class="hamburger-container" class="hamburger-container"
@@ -53,11 +53,9 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
<LaySearch id="header-search" /> <LaySearch id="header-search" />
<!-- 国际化 --> <!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click"> <el-dropdown id="header-translation" trigger="click">
<div <GlobalizationIcon
class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
> />
<IconifyIconOffline :icon="GlobalizationIcon" />
</div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu class="translation"> <el-dropdown-menu class="translation">
<el-dropdown-item <el-dropdown-item
@@ -115,7 +113,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</template> </template>
</el-dropdown> </el-dropdown>
<span <span
class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="set-icon navbar-bg-hover"
:title="t('buttons.pureOpenSystemSet')" :title="t('buttons.pureOpenSystemSet')"
@click="onPanel" @click="onPanel"
> >
@@ -174,7 +172,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
} }
.translation { .translation {
:deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
padding: 5px 40px; padding: 5px 40px;
} }
@@ -192,7 +190,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
.logout { .logout {
width: 120px; width: 120px;
:deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
display: inline-flex; display: inline-flex;
flex-wrap: wrap; flex-wrap: wrap;
min-width: 100%; min-width: 100%;

View File

@@ -49,7 +49,7 @@ function hoverDescription(event, description) {
<template> <template>
<div <div
class="notice-container border-0 border-b border-solid border-[#f0f0f0] dark:border-[#303030]" class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
> >
<el-avatar <el-avatar
v-if="noticeItem.avatar" v-if="noticeItem.avatar"

View File

@@ -3,12 +3,15 @@ import { useI18n } from "vue-i18n";
import { ref, computed } from "vue"; import { ref, computed } from "vue";
import { noticesData } from "./data"; import { noticesData } from "./data";
import NoticeList from "./components/NoticeList.vue"; import NoticeList from "./components/NoticeList.vue";
import BellIcon from "~icons/lucide/bell"; import BellIcon from "~icons/ep/bell";
const { t } = useI18n(); const { t } = useI18n();
const noticesNum = ref(0);
const notices = ref(noticesData); const notices = ref(noticesData);
const activeKey = ref(noticesData[0]?.key); const activeKey = ref(noticesData[0]?.key);
notices.value.map(v => (noticesNum.value += v.list.length));
const getLabel = computed( const getLabel = computed(
() => item => () => item =>
t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "") t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
@@ -18,9 +21,14 @@ const getLabel = computed(
<template> <template>
<el-dropdown trigger="click" placement="bottom-end"> <el-dropdown trigger="click" placement="bottom-end">
<span <span
:class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-1.75']" :class="[
'dropdown-badge',
'navbar-bg-hover',
'select-none',
Number(noticesNum) !== 0 && 'mr-[10px]'
]"
> >
<el-badge is-dot> <el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
<span class="header-notice-icon"> <span class="header-notice-icon">
<IconifyIconOffline :icon="BellIcon" /> <IconifyIconOffline :icon="BellIcon" />
</span> </span>
@@ -57,34 +65,6 @@ const getLabel = computed(
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
/* ”铃铛“摇晃衰减动画 */
@keyframes pure-bell-ring {
0%,
100% {
transform-origin: top;
}
15% {
transform: rotateZ(10deg);
}
30% {
transform: rotateZ(-10deg);
}
45% {
transform: rotateZ(5deg);
}
60% {
transform: rotateZ(-5deg);
}
75% {
transform: rotateZ(2deg);
}
}
.dropdown-badge { .dropdown-badge {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -94,13 +74,7 @@ const getLabel = computed(
cursor: pointer; cursor: pointer;
.header-notice-icon { .header-notice-icon {
font-size: 16px; font-size: 18px;
}
&:hover {
.header-notice-icon svg {
animation: pure-bell-ring 1s both;
}
} }
} }

View File

@@ -11,10 +11,13 @@ const show = ref<Boolean>(false);
const iconClass = computed(() => { const iconClass = computed(() => {
return [ return [
"size-5.5", "w-[22px]",
"flex-c", "h-[22px]",
"flex",
"justify-center",
"items-center",
"outline-hidden", "outline-hidden",
"rounded-sm", "rounded-[4px]",
"cursor-pointer", "cursor-pointer",
"transition-colors", "transition-colors",
"hover:bg-[#0000000f]", "hover:bg-[#0000000f]",
@@ -48,7 +51,7 @@ onBeforeUnmount(() => {
<div class="right-panel-background" /> <div class="right-panel-background" />
<div ref="target" class="right-panel bg-bg_color"> <div ref="target" class="right-panel bg-bg_color">
<div <div
class="flex-bc py-3 px-5 border-0 border-l border-solid border-(--pure-border-color)" class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
> >
<h4 class="dark:text-white"> <h4 class="dark:text-white">
{{ t("panel.pureSystemSet") }} {{ t("panel.pureSystemSet") }}
@@ -70,14 +73,12 @@ onBeforeUnmount(() => {
/> />
</span> </span>
</div> </div>
<el-scrollbar <el-scrollbar>
class="border-y border-l border-r-0 border-solid border-(--pure-border-color) h-[calc(100vh-104px)]!"
>
<slot /> <slot />
</el-scrollbar> </el-scrollbar>
<div <div
class="flex justify-end p-3 border-0 border-l border-solid border-(--pure-border-color)" class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
> >
<el-button <el-button
v-tippy="{ v-tippy="{
@@ -98,6 +99,10 @@ onBeforeUnmount(() => {
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.el-scrollbar) {
height: calc(100vh - 110px);
}
.right-panel-background { .right-panel-background {
position: fixed; position: fixed;
top: 0; top: 0;
@@ -134,4 +139,11 @@ onBeforeUnmount(() => {
transform: translate(0); transform: translate(0);
} }
} }
.project-configuration {
display: flex;
align-items: center;
justify-content: space-between;
padding: 14px 20px;
}
</style> </style>

View File

@@ -34,12 +34,12 @@ function handleDelete(item) {
<IconifyIconOffline <IconifyIconOffline
v-show="item.type === 'history'" v-show="item.type === 'history'"
:icon="StarIcon" :icon="StarIcon"
class="size-4.5 mr-2 hover:text-[#d7d5d4]" class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
@click.stop="handleCollect(item)" @click.stop="handleCollect(item)"
/> />
<IconifyIconOffline <IconifyIconOffline
:icon="CloseIcon" :icon="CloseIcon"
class="size-4.5 hover:text-[#d7d5d4] cursor-pointer" class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
@click.stop="handleDelete(item)" @click.stop="handleDelete(item)"
/> />
</template> </template>

View File

@@ -6,8 +6,8 @@ import { useRouter } from "vue-router";
import SearchResult from "./SearchResult.vue"; import SearchResult from "./SearchResult.vue";
import SearchFooter from "./SearchFooter.vue"; import SearchFooter from "./SearchFooter.vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { transformI18n } from "@/plugins/i18n";
import SearchHistory from "./SearchHistory.vue"; import SearchHistory from "./SearchHistory.vue";
import { transformI18n, $t } from "@/plugins/i18n";
import type { optionsItem, dragItem } from "../types"; import type { optionsItem, dragItem } from "../types";
import { ref, computed, shallowRef, watch } from "vue"; import { ref, computed, shallowRef, watch } from "vue";
import { useDebounceFn, onKeyStroke } from "@vueuse/core"; import { useDebounceFn, onKeyStroke } from "@vueuse/core";
@@ -297,7 +297,10 @@ onKeyStroke("ArrowDown", handleDown);
@input="handleSearch" @input="handleSearch"
> >
<template #prefix> <template #prefix>
<IconifyIconOffline :icon="SearchIcon" class="text-primary size-6" /> <IconifyIconOffline
:icon="SearchIcon"
class="text-primary w-[24px] h-[24px]"
/>
</template> </template>
</el-input> </el-input>
<div class="search-content"> <div class="search-content">

View File

@@ -11,7 +11,7 @@ function handleSearch() {
<template> <template>
<div> <div>
<div <div
class="search-container w-10 h-12 flex-c cursor-pointer navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
@click="handleSearch" @click="handleSearch"
> >
<IconifyIconOffline icon="ri/search-line" /> <IconifyIconOffline icon="ri/search-line" />

View File

@@ -37,7 +37,7 @@ const horizontalRef = ref();
const { const {
dataTheme, dataTheme,
themeMode, overallStyle,
layoutTheme, layoutTheme,
themeColors, themeColors,
toggleClass, toggleClass,
@@ -50,7 +50,7 @@ if (unref(layoutTheme)) {
const layout = unref(layoutTheme).layout; const layout = unref(layoutTheme).layout;
const theme = unref(layoutTheme).theme; const theme = unref(layoutTheme).theme;
document.documentElement.setAttribute("data-theme", theme); document.documentElement.setAttribute("data-theme", theme);
setMenuLayout(layout); setLayoutModel(layout);
} }
/** 默认灵动模式 */ /** 默认灵动模式 */
@@ -189,30 +189,30 @@ const getThemeColor = computed(() => {
}); });
const pClass = computed(() => { const pClass = computed(() => {
return ["mb-3!", "font-medium", "text-sm", "dark:text-white"]; return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
}); });
const themeOptions = computed<Array<OptionsType>>(() => { const themeOptions = computed<Array<OptionsType>>(() => {
return [ return [
{ {
label: t("panel.pureThemeModeLight"), label: t("panel.pureOverallStyleLight"),
icon: DayIcon, icon: DayIcon,
theme: "light", theme: "light",
tip: t("panel.pureThemeModeLightTip"), tip: t("panel.pureOverallStyleLightTip"),
iconAttrs: { fill: isDark.value ? "#fff" : "#000" } iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
}, },
{ {
label: t("panel.pureThemeModeDark"), label: t("panel.pureOverallStyleDark"),
icon: DarkIcon, icon: DarkIcon,
theme: "dark", theme: "dark",
tip: t("panel.pureThemeModeDarkTip"), tip: t("panel.pureOverallStyleDarkTip"),
iconAttrs: { fill: isDark.value ? "#fff" : "#000" } iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
}, },
{ {
label: t("panel.pureThemeModeSystem"), label: t("panel.pureOverallStyleSystem"),
icon: SystemIcon, icon: SystemIcon,
theme: "system", theme: "system",
tip: t("panel.pureThemeModeSystemTip"), tip: t("panel.pureOverallStyleSystemTip"),
iconAttrs: { fill: isDark.value ? "#fff" : "#000" } iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
} }
]; ];
@@ -238,8 +238,8 @@ const markOptions = computed<Array<OptionsType>>(() => {
]; ];
}); });
/** 设置菜单布局 */ /** 设置导航模式 */
function setMenuLayout(layout: string) { function setLayoutModel(layout: string) {
layoutTheme.value.layout = layout; layoutTheme.value.layout = layout;
window.document.body.setAttribute("layout", layout); window.document.body.setAttribute("layout", layout);
$storage.layout = { $storage.layout = {
@@ -249,7 +249,7 @@ function setMenuLayout(layout: string) {
sidebarStatus: $storage.layout?.sidebarStatus, sidebarStatus: $storage.layout?.sidebarStatus,
epThemeColor: $storage.layout?.epThemeColor, epThemeColor: $storage.layout?.epThemeColor,
themeColor: $storage.layout?.themeColor, themeColor: $storage.layout?.themeColor,
themeMode: $storage.layout?.themeMode overallStyle: $storage.layout?.overallStyle
}; };
useAppStoreHook().setLayout(layout); useAppStoreHook().setLayout(layout);
} }
@@ -276,15 +276,15 @@ watch($storage, ({ layout }) => {
const mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)"); const mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)");
/** 根据操作系统主题设置平台主题模式 */ /** 根据操作系统主题设置平台整体风格 */
function updateTheme() { function updateTheme() {
if (themeMode.value !== "system") return; if (overallStyle.value !== "system") return;
if (mediaQueryList.matches) { if (mediaQueryList.matches) {
dataTheme.value = true; dataTheme.value = true;
} else { } else {
dataTheme.value = false; dataTheme.value = false;
} }
dataThemeChange(themeMode.value); dataThemeChange(overallStyle.value);
} }
function removeMatchMedia() { function removeMatchMedia() {
@@ -317,18 +317,18 @@ onUnmounted(() => removeMatchMedia);
<template> <template>
<LayPanel> <LayPanel>
<div class="p-5"> <div class="p-5">
<p :class="pClass">{{ t("panel.pureThemeMode") }}</p> <p :class="pClass">{{ t("panel.pureOverallStyle") }}</p>
<Segmented <Segmented
resize resize
class="select-none" class="select-none"
:modelValue="themeMode === 'system' ? 2 : dataTheme ? 1 : 0" :modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0"
:options="themeOptions" :options="themeOptions"
@change=" @change="
theme => { theme => {
theme.index === 1 && theme.index !== 2 theme.index === 1 && theme.index !== 2
? (dataTheme = true) ? (dataTheme = true)
: (dataTheme = false); : (dataTheme = false);
themeMode = theme.option.theme; overallStyle = theme.option.theme;
dataThemeChange(theme.option.theme); dataThemeChange(theme.option.theme);
theme.index === 2 && watchSystemThemeChange(); theme.index === 2 && watchSystemThemeChange();
} }
@@ -345,8 +345,8 @@ onUnmounted(() => removeMatchMedia);
@click="setLayoutThemeColor(item.themeColor)" @click="setLayoutThemeColor(item.themeColor)"
> >
<el-icon <el-icon
class="mt-px" style="margin: 0.1em 0.1em 0 0"
:size="20" :size="17"
:color="getThemeColor(item.themeColor)" :color="getThemeColor(item.themeColor)"
> >
<IconifyIconOffline :icon="Check" /> <IconifyIconOffline :icon="Check" />
@@ -354,7 +354,7 @@ onUnmounted(() => removeMatchMedia);
</li> </li>
</ul> </ul>
<p :class="['mt-5!', pClass]">{{ t("panel.pureMenuLayout") }}</p> <p :class="['mt-5!', pClass]">{{ t("panel.pureLayoutModel") }}</p>
<ul class="pure-theme"> <ul class="pure-theme">
<li <li
ref="verticalRef" ref="verticalRef"
@@ -363,7 +363,7 @@ onUnmounted(() => removeMatchMedia);
zIndex: 41000 zIndex: 41000
}" }"
:class="layoutTheme.layout === 'vertical' ? 'is-select' : ''" :class="layoutTheme.layout === 'vertical' ? 'is-select' : ''"
@click="setMenuLayout('vertical')" @click="setLayoutModel('vertical')"
> >
<div /> <div />
<div /> <div />
@@ -376,7 +376,7 @@ onUnmounted(() => removeMatchMedia);
zIndex: 41000 zIndex: 41000
}" }"
:class="layoutTheme.layout === 'horizontal' ? 'is-select' : ''" :class="layoutTheme.layout === 'horizontal' ? 'is-select' : ''"
@click="setMenuLayout('horizontal')" @click="setLayoutModel('horizontal')"
> >
<div /> <div />
<div /> <div />
@@ -389,7 +389,7 @@ onUnmounted(() => removeMatchMedia);
zIndex: 41000 zIndex: 41000
}" }"
:class="layoutTheme.layout === 'mix' ? 'is-select' : ''" :class="layoutTheme.layout === 'mix' ? 'is-select' : ''"
@click="setMenuLayout('mix')" @click="setLayoutModel('mix')"
> >
<div /> <div />
<div /> <div />
@@ -416,7 +416,7 @@ onUnmounted(() => removeMatchMedia);
<button <button
v-else v-else
v-ripple="{ class: 'text-gray-300' }" v-ripple="{ class: 'text-gray-300' }"
class="bg-transparent flex-c w-full h-20 rounded-md border border-(--pure-border-color)" class="bg-transparent flex-c w-full h-20 rounded-md border border-[var(--pure-border-color)]"
@click="setStretch(!settings.stretch)" @click="setStretch(!settings.stretch)"
> >
<div <div
@@ -538,24 +538,17 @@ onUnmounted(() => removeMatchMedia);
} }
.theme-color { .theme-color {
display: flex; height: 20px;
gap: 8px;
margin-top: 8px;
li { li {
position: relative; float: left;
width: 21px; height: 20px;
height: 21px; margin-right: 8px;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
box-shadow: rgb(0 0 0 / 15%) 0 0 0 1px inset;
transition: all 0.2s ease;
&:hover { &:nth-child(1) {
box-shadow: border: 1px solid #ddd;
rgb(0 0 0 / 25%) 0 0 0 1px inset,
0 2px 4px rgb(0 0 0 / 15%);
transform: scale(1.1);
} }
} }
} }

View File

@@ -83,11 +83,9 @@ onMounted(() => {
<LaySearch id="header-search" /> <LaySearch id="header-search" />
<!-- 国际化 --> <!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click"> <el-dropdown id="header-translation" trigger="click">
<div <GlobalizationIcon
class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
> />
<IconifyIconOffline :icon="GlobalizationIcon" />
</div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu class="translation"> <el-dropdown-menu class="translation">
<el-dropdown-item <el-dropdown-item
@@ -143,7 +141,7 @@ onMounted(() => {
</template> </template>
</el-dropdown> </el-dropdown>
<span <span
class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="set-icon navbar-bg-hover"
:title="t('buttons.pureOpenSystemSet')" :title="t('buttons.pureOpenSystemSet')"
@click="onPanel" @click="onPanel"
> >
@@ -159,7 +157,7 @@ onMounted(() => {
} }
.translation { .translation {
:deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
padding: 5px 40px; padding: 5px 40px;
} }
@@ -177,7 +175,7 @@ onMounted(() => {
.logout { .logout {
width: 120px; width: 120px;
:deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
display: inline-flex; display: inline-flex;
flex-wrap: wrap; flex-wrap: wrap;
min-width: 100%; min-width: 100%;

View File

@@ -104,11 +104,9 @@ watch(
<LaySearch id="header-search" /> <LaySearch id="header-search" />
<!-- 国际化 --> <!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click"> <el-dropdown id="header-translation" trigger="click">
<div <GlobalizationIcon
class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
> />
<IconifyIconOffline :icon="GlobalizationIcon" />
</div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu class="translation"> <el-dropdown-menu class="translation">
<el-dropdown-item <el-dropdown-item
@@ -164,7 +162,7 @@ watch(
</template> </template>
</el-dropdown> </el-dropdown>
<span <span
class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce" class="set-icon navbar-bg-hover"
:title="t('buttons.pureOpenSystemSet')" :title="t('buttons.pureOpenSystemSet')"
@click="onPanel" @click="onPanel"
> >
@@ -180,7 +178,7 @@ watch(
} }
.translation { .translation {
:deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
padding: 5px 40px; padding: 5px 40px;
} }
@@ -198,7 +196,7 @@ watch(
.logout { .logout {
width: 120px; width: 120px;
:deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
display: inline-flex; display: inline-flex;
flex-wrap: wrap; flex-wrap: wrap;
min-width: 100%; min-width: 100%;

View File

@@ -105,7 +105,7 @@ watch(
</script> </script>
<template> <template>
<el-breadcrumb class="leading-12.5! select-none" separator="/"> <el-breadcrumb class="leading-[50px]! select-none" separator="/">
<transition-group name="breadcrumb"> <transition-group name="breadcrumb">
<el-breadcrumb-item <el-breadcrumb-item
v-for="item in levelList" v-for="item in levelList"

View File

@@ -18,7 +18,7 @@ const { t } = useI18n();
const { tooltipEffect } = useNav(); const { tooltipEffect } = useNav();
const iconClass = computed(() => { const iconClass = computed(() => {
return ["size-4"]; return ["w-[16px]", "h-[16px]"];
}); });
const { $storage } = useGlobal<GlobalPropertiesApi>(); const { $storage } = useGlobal<GlobalPropertiesApi>();

View File

@@ -11,7 +11,10 @@ defineProps({
</script> </script>
<template> <template>
<div v-if="extraIcon" class="flex-c"> <div v-if="extraIcon" class="flex justify-center items-center">
<component :is="useRenderIcon(toRaw(extraIcon))" class="size-7.5" /> <component
:is="useRenderIcon(toRaw(extraIcon))"
class="w-[30px] h-[30px]"
/>
</div> </div>
</template> </template>

View File

@@ -24,10 +24,7 @@ watch(
</script> </script>
<template> <template>
<span <span class="fullscreen-icon navbar-bg-hover" @click="toggle">
class="fullscreen-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
@click="toggle"
>
<IconifyIconOffline :icon="screenIcon" /> <IconifyIconOffline :icon="screenIcon" />
</span> </span>
</template> </template>

View File

@@ -61,21 +61,6 @@ const getSubMenuIconStyle = computed((): CSSProperties => {
}; };
}); });
const textClass = computed(() => {
const item = props.item;
const baseClass = "w-full! text-inherit!";
if (
layout.value !== "horizontal" &&
isCollapse.value &&
!toRaw(item.meta.icon) &&
((layout.value === "vertical" && item.parentId === null) ||
(layout.value === "mix" && item.pathList.length === 2))
) {
return `${baseClass} min-w-13.5! text-center! px-3!`;
}
return baseClass;
});
const expandCloseIcon = computed(() => { const expandCloseIcon = computed(() => {
if (!getConfig()?.MenuArrowIconNoTransition) return ""; if (!getConfig()?.MenuArrowIconNoTransition) return "";
return { return {
@@ -159,7 +144,7 @@ function resolvePath(routePath) {
item?.pathList?.length === 2) item?.pathList?.length === 2)
" "
truncated truncated
class="w-full! px-3! min-w-13.5! text-center! text-inherit!" class="w-full! pl-4! text-inherit!"
> >
{{ transformI18n(onlyOneChild.meta.title) }} {{ transformI18n(onlyOneChild.meta.title) }}
</el-text> </el-text>
@@ -210,7 +195,15 @@ function resolvePath(routePath) {
offset: [0, -10], offset: [0, -10],
theme: tooltipEffect theme: tooltipEffect
}" }"
:class="textClass" :class="{
'w-full!': true,
'text-inherit!': true,
'pl-4!':
layout !== 'horizontal' &&
isCollapse &&
!toRaw(item.meta.icon) &&
item.parentId === null
}"
> >
{{ transformI18n(item.meta.title) }} {{ transformI18n(item.meta.title) }}
</ReText> </ReText>

View File

@@ -21,11 +21,12 @@ const iconClass = computed(() => {
return [ return [
"ml-4", "ml-4",
"mb-1", "mb-1",
"size-4", "w-[16px]",
"h-[16px]",
"inline-block!", "inline-block!",
"align-middle", "align-middle",
"cursor-pointer", "cursor-pointer",
"duration-100" "duration-[100ms]"
]; ];
}); });

View File

@@ -32,7 +32,7 @@ const toggleClick = () => {
> >
<IconifyIconOffline <IconifyIconOffline
:icon="isActive ? MenuFold : MenuUnfold" :icon="isActive ? MenuFold : MenuUnfold"
class="inline-block! align-middle hover:text-primary dark:hover:text-white!" class="inline-block align-middle hover:text-primary dark:hover:text-white!"
/> />
</div> </div>
</template> </template>

View File

@@ -1,5 +1,5 @@
<template> <template>
<svg class="size-full"> <svg class="w-full h-full">
<defs> <defs>
<symbol id="geometry-left" viewBox="0 0 214 36"> <symbol id="geometry-left" viewBox="0 0 214 36">
<path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z" /> <path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z" />

View File

@@ -321,9 +321,10 @@
.chrome-tab-divider { .chrome-tab-divider {
position: absolute; position: absolute;
left: 7px; right: 7px;
width: 1px; width: 1px;
height: 14px; height: 14px;
background-color: #2b2d2f;
} }
&:hover { &:hover {

View File

@@ -1,7 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { $t } from "@/plugins/i18n"; import { $t } from "@/plugins/i18n";
import { emitter } from "@/utils/mitt"; import { emitter } from "@/utils/mitt";
import NProgress from "@/utils/progress";
import { RouteConfigs } from "../../types"; import { RouteConfigs } from "../../types";
import { useTags } from "../../hooks/useTag"; import { useTags } from "../../hooks/useTag";
import { routerArrays } from "@/layout/types"; import { routerArrays } from "@/layout/types";
@@ -207,14 +206,12 @@ function dynamicRouteTag(value: string): void {
/** 刷新路由 */ /** 刷新路由 */
function onFresh() { function onFresh() {
NProgress.start();
const { fullPath, query } = unref(route); const { fullPath, query } = unref(route);
router.replace({ router.replace({
path: "/redirect" + fullPath, path: "/redirect" + fullPath,
query query
}); });
handleAliveRoute(route as ToRouteType, "refresh"); handleAliveRoute(route as ToRouteType, "refresh");
NProgress.done();
} }
function deleteDynamicTag(obj: any, current: any, tag?: string) { function deleteDynamicTag(obj: any, current: any, tag?: string) {
@@ -257,7 +254,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
if (tag === "other") { if (tag === "other") {
spliceRoute(1, 1, true); spliceRoute(1, 1, true);
} else if (tag === "left") { } else if (tag === "left") {
spliceRoute(fixedTags.length, valueIndex - fixedTags.length); spliceRoute(fixedTags.length, valueIndex - 1, true);
} else if (tag === "right") { } else if (tag === "right") {
spliceRoute(valueIndex + 1, multiTags.value.length); spliceRoute(valueIndex + 1, multiTags.value.length);
} else { } else {
@@ -356,7 +353,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
break; break;
} }
setTimeout(() => { setTimeout(() => {
showMenuModel(route.fullPath, route.query, route.params); showMenuModel(route.fullPath, route.query);
}); });
} }
@@ -391,18 +388,15 @@ function disabledMenus(value: boolean, fixedTag = false) {
function showMenuModel( function showMenuModel(
currentPath: string, currentPath: string,
query: object = {}, query: object = {},
params: object = {},
refresh = false refresh = false
) { ) {
const allRoute = multiTags.value; const allRoute = multiTags.value;
const routeLength = multiTags.value.length; const routeLength = multiTags.value.length;
let currentIndex = -1; let currentIndex = -1;
if (!isAllEmpty(params)) { if (isAllEmpty(query)) {
currentIndex = allRoute.findIndex(v => isEqual(v.params, params));
} else if (!isAllEmpty(query)) {
currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
} else {
currentIndex = allRoute.findIndex(v => v.path === currentPath); currentIndex = allRoute.findIndex(v => v.path === currentPath);
} else {
currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
} }
function fixedTagDisabled() { function fixedTagDisabled() {
if (allRoute[currentIndex]?.meta?.fixedTag) { if (allRoute[currentIndex]?.meta?.fixedTag) {
@@ -468,14 +462,14 @@ function openMenu(tag, e) {
} else if (route.path !== tag.path && route.name !== tag.name) { } else if (route.path !== tag.path && route.name !== tag.name) {
// 右键菜单不匹配当前路由,隐藏刷新 // 右键菜单不匹配当前路由,隐藏刷新
tagsViews[0].show = false; tagsViews[0].show = false;
showMenuModel(tag.path, tag.query, tag.params); showMenuModel(tag.path, tag.query);
} else if (multiTags.value.length === 2 && route.path !== tag.path) { } else if (multiTags.value.length === 2 && route.path !== tag.path) {
showMenus(true); showMenus(true);
// 只有两个标签时不显示关闭其他标签页 // 只有两个标签时不显示关闭其他标签页
tagsViews[4].show = false; tagsViews[4].show = false;
showMenuModel(tag.path, tag.query, tag.params); } else if (route.path === tag.path) {
} else { // 右键当前激活的菜单
showMenuModel(tag.path, tag.query, tag.params, true); showMenuModel(tag.path, tag.query, true);
} }
currentSelect.value = tag; currentSelect.value = tag;
@@ -618,10 +612,6 @@ onBeforeUnmount(() => {
/> />
</template> </template>
<div v-else class="chrome-tab"> <div v-else class="chrome-tab">
<span
v-if="index !== 0 && index !== activeIndex"
class="chrome-tab-divider bg-[#e2e2e2] dark:bg-[#2d2d2d]"
/>
<div class="chrome-tab__bg"> <div class="chrome-tab__bg">
<TagChrome /> <TagChrome />
</div> </div>
@@ -635,6 +625,7 @@ onBeforeUnmount(() => {
> >
<IconifyIconOffline :icon="Close" /> <IconifyIconOffline :icon="Close" />
</span> </span>
<span class="chrome-tab-divider" />
</div> </div>
</div> </div>
</div> </div>

View File

@@ -19,22 +19,13 @@ const loading = ref(true);
const currentRoute = useRoute(); const currentRoute = useRoute();
const frameSrc = ref<string>(""); const frameSrc = ref<string>("");
const frameRef = ref<HTMLElement | null>(null); const frameRef = ref<HTMLElement | null>(null);
const fallbackTimer = ref<number | null>(null);
if (unref(currentRoute.meta)?.frameSrc) { if (unref(currentRoute.meta)?.frameSrc) {
frameSrc.value = unref(currentRoute.meta)?.frameSrc as string; frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
} }
unref(currentRoute.meta)?.frameLoading === false && hideLoading();
function clearFallbackTimer() {
if (fallbackTimer.value !== null) {
clearTimeout(fallbackTimer.value);
fallbackTimer.value = null;
}
}
function hideLoading() { function hideLoading() {
loading.value = false; loading.value = false;
clearFallbackTimer();
} }
function init() { function init() {
@@ -43,42 +34,32 @@ function init() {
if (!iframe) return; if (!iframe) return;
const _frame = iframe as any; const _frame = iframe as any;
if (_frame.attachEvent) { if (_frame.attachEvent) {
_frame.attachEvent("onload", hideLoading); _frame.attachEvent("onload", () => {
hideLoading();
});
} else { } else {
iframe.onload = hideLoading; iframe.onload = () => {
hideLoading();
};
} }
}); });
} }
let isRedirect = false;
watch( watch(
() => currentRoute.fullPath, () => currentRoute.fullPath,
path => { path => {
if ( if (
currentRoute.name === "Redirect" && currentRoute.name === "Redirect" &&
props.frameInfo?.fullPath && path.includes(props.frameInfo?.fullPath)
path.includes(props.frameInfo.fullPath)
) { ) {
isRedirect = true; frameSrc.value = path; // redirect时置换成任意值待重定向后 重新赋值
loading.value = true; loading.value = true;
return;
} }
if (props.frameInfo?.fullPath === path && isRedirect) { // 重新赋值
loading.value = true; if (props.frameInfo?.fullPath === path) {
clearFallbackTimer(); frameSrc.value = props.frameInfo?.frameSrc;
const url = new URL(props.frameInfo.frameSrc, window.location.origin);
const joinChar = url.search ? "&" : "?";
frameSrc.value = `${props.frameInfo.frameSrc}${joinChar}t=${Date.now()}`;
fallbackTimer.value = window.setTimeout(() => {
if (loading.value) {
hideLoading();
}
}, 1500);
isRedirect = false;
} }
}, }
{ immediate: true }
); );
onMounted(() => { onMounted(() => {

View File

@@ -33,7 +33,7 @@ export function useDataThemeChange() {
const { $storage } = useGlobal<GlobalPropertiesApi>(); const { $storage } = useGlobal<GlobalPropertiesApi>();
const dataTheme = ref<boolean>($storage?.layout?.darkMode); const dataTheme = ref<boolean>($storage?.layout?.darkMode);
const themeMode = ref<string>($storage?.layout?.themeMode); const overallStyle = ref<string>($storage?.layout?.overallStyle);
const body = document.documentElement as HTMLElement; const body = document.documentElement as HTMLElement;
function toggleClass(flag: boolean, clsName: string, target?: HTMLElement) { function toggleClass(flag: boolean, clsName: string, target?: HTMLElement) {
@@ -59,7 +59,7 @@ export function useDataThemeChange() {
sidebarStatus: $storage.layout?.sidebarStatus, sidebarStatus: $storage.layout?.sidebarStatus,
epThemeColor: $storage.layout?.epThemeColor, epThemeColor: $storage.layout?.epThemeColor,
themeColor: isClick ? theme : storageThemeColor, themeColor: isClick ? theme : storageThemeColor,
themeMode: themeMode.value overallStyle: overallStyle.value
}; };
if (theme === "default" || theme === "light") { if (theme === "default" || theme === "light") {
@@ -89,9 +89,9 @@ export function useDataThemeChange() {
} }
}; };
/** 浅色、深色主题模式切换 */ /** 浅色、深色整体风格切换 */
function dataThemeChange(mode?: string) { function dataThemeChange(overall?: string) {
themeMode.value = mode; overallStyle.value = overall;
if (useEpThemeStoreHook().epTheme === "light" && dataTheme.value) { if (useEpThemeStoreHook().epTheme === "light" && dataTheme.value) {
setLayoutThemeColor("default", false); setLayoutThemeColor("default", false);
} else { } else {
@@ -126,7 +126,7 @@ export function useDataThemeChange() {
return { return {
body, body,
dataTheme, dataTheme,
themeMode, overallStyle,
layoutTheme, layoutTheme,
themeColors, themeColors,
onReset, onReset,

View File

@@ -29,7 +29,7 @@ export function useLayout() {
sidebarStatus: $config?.SidebarStatus ?? true, sidebarStatus: $config?.SidebarStatus ?? true,
epThemeColor: $config?.EpThemeColor ?? "#409EFF", epThemeColor: $config?.EpThemeColor ?? "#409EFF",
themeColor: $config?.Theme ?? "light", themeColor: $config?.Theme ?? "light",
themeMode: $config?.ThemeMode ?? "light" overallStyle: $config?.OverallStyle ?? "light"
}; };
} }
/** 灰色模式、色弱模式、隐藏标签页 */ /** 灰色模式、色弱模式、隐藏标签页 */

View File

@@ -114,21 +114,14 @@ export function useTags() {
]); ]);
function conditionHandle(item, previous, next) { function conditionHandle(item, previous, next) {
const currentName = route.name || "";
const itemName = item.name || "";
if (isBoolean(route?.meta?.showLink) && route?.meta?.showLink === false) { if (isBoolean(route?.meta?.showLink) && route?.meta?.showLink === false) {
if (Object.keys(route.query).length > 0) { if (Object.keys(route.query).length > 0) {
return currentName === itemName && isEqual(route.query, item.query) return isEqual(route.query, item.query) ? previous : next;
? previous
: next;
} else { } else {
return currentName === itemName && isEqual(route.params, item.params) return isEqual(route.params, item.params) ? previous : next;
? previous
: next;
} }
} else { } else {
return currentName === itemName ? previous : next; return route.path === item.path ? previous : next;
} }
} }

View File

@@ -67,16 +67,16 @@ const set: setType = reactive({
}) })
}); });
function setTheme(menuLayout: string) { function setTheme(layoutModel: string) {
window.document.body.setAttribute("layout", menuLayout); window.document.body.setAttribute("layout", layoutModel);
$storage.layout = { $storage.layout = {
layout: `${menuLayout}`, layout: `${layoutModel}`,
theme: $storage.layout?.theme, theme: $storage.layout?.theme,
darkMode: $storage.layout?.darkMode, darkMode: $storage.layout?.darkMode,
sidebarStatus: $storage.layout?.sidebarStatus, sidebarStatus: $storage.layout?.sidebarStatus,
epThemeColor: $storage.layout?.epThemeColor, epThemeColor: $storage.layout?.epThemeColor,
themeColor: $storage.layout?.themeColor, themeColor: $storage.layout?.themeColor,
themeMode: $storage.layout?.themeMode overallStyle: $storage.layout?.overallStyle
}; };
} }
@@ -123,7 +123,7 @@ onMounted(() => {
}); });
onBeforeMount(() => { onBeforeMount(() => {
useDataThemeChange().dataThemeChange($storage.layout?.themeMode); useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
}); });
const LayHeader = defineComponent({ const LayHeader = defineComponent({

View File

@@ -6,7 +6,6 @@ export const routerArrays: Array<RouteConfigs> =
? [ ? [
{ {
path: "/welcome", path: "/welcome",
name: "Welcome",
meta: { meta: {
title: "menus.pureHome", title: "menus.pureHome",
icon: "ep/home-filled" icon: "ep/home-filled"

View File

@@ -3,13 +3,15 @@ import type { App, Component } from "vue";
import { import {
/** /**
* 为了方便演示平台将 element-plus 导出的所有组件引入,实际使用中如果你没用到哪个组件,将其注释掉就行 * 为了方便演示平台将 element-plus 导出的所有组件引入,实际使用中如果你没用到哪个组件,将其注释掉就行
* 导出来源https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/component.ts#L116-L226 * 导出来源https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/component.ts#L111-L211
* */ * */
ElAffix, ElAffix,
ElAlert, ElAlert,
ElAutocomplete, ElAutocomplete,
ElAutoResizer, ElAutoResizer,
ElAvatar, ElAvatar,
ElAnchor,
ElAnchorLink,
ElBacktop, ElBacktop,
ElBadge, ElBadge,
ElBreadcrumb, ElBreadcrumb,
@@ -30,7 +32,6 @@ import {
ElCollapse, ElCollapse,
ElCollapseItem, ElCollapseItem,
ElCollapseTransition, ElCollapseTransition,
ElColorPickerPanel,
ElColorPicker, ElColorPicker,
ElConfigProvider, ElConfigProvider,
ElContainer, ElContainer,
@@ -39,7 +40,6 @@ import {
ElHeader, ElHeader,
ElMain, ElMain,
ElDatePicker, ElDatePicker,
ElDatePickerPanel,
ElDescriptions, ElDescriptions,
ElDescriptionsItem, ElDescriptionsItem,
ElDialog, ElDialog,
@@ -56,7 +56,6 @@ import {
ElImageViewer, ElImageViewer,
ElInput, ElInput,
ElInputNumber, ElInputNumber,
ElInputTag,
ElLink, ElLink,
ElMenu, ElMenu,
ElMenuItem, ElMenuItem,
@@ -108,22 +107,17 @@ import {
ElWatermark, ElWatermark,
ElTour, ElTour,
ElTourStep, ElTourStep,
ElAnchor,
ElAnchorLink,
ElSegmented, ElSegmented,
ElMention,
ElSplitter,
ElSplitterPanel,
/** /**
* 为了方便演示平台将 element-plus 导出的所有插件引入,实际使用中如果你没用到哪个插件,将其注释掉就行 * 为了方便演示平台将 element-plus 导出的所有插件引入,实际使用中如果你没用到哪个插件,将其注释掉就行
* 导出来源https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/plugin.ts#L11-L16 * 导出来源https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/plugin.ts#L11-L16
* */ * */
ElInfiniteScroll, // v-infinite-scroll 指令
ElLoading, // v-loading 指令 ElLoading, // v-loading 指令
ElInfiniteScroll, // v-infinite-scroll 指令
ElPopoverDirective, // v-popover 指令
ElMessage, // $message 全局属性对象globalProperties ElMessage, // $message 全局属性对象globalProperties
ElMessageBox, // $msgbox、$alert、$confirm、$prompt 全局属性对象globalProperties ElMessageBox, // $msgbox、$alert、$confirm、$prompt 全局属性对象globalProperties
ElNotification, // $notify 全局属性对象globalProperties ElNotification // $notify 全局属性对象globalProperties
ElPopoverDirective // v-popover 指令
} from "element-plus"; } from "element-plus";
const components = [ const components = [
@@ -132,6 +126,8 @@ const components = [
ElAutocomplete, ElAutocomplete,
ElAutoResizer, ElAutoResizer,
ElAvatar, ElAvatar,
ElAnchor,
ElAnchorLink,
ElBacktop, ElBacktop,
ElBadge, ElBadge,
ElBreadcrumb, ElBreadcrumb,
@@ -152,7 +148,6 @@ const components = [
ElCollapse, ElCollapse,
ElCollapseItem, ElCollapseItem,
ElCollapseTransition, ElCollapseTransition,
ElColorPickerPanel,
ElColorPicker, ElColorPicker,
ElConfigProvider, ElConfigProvider,
ElContainer, ElContainer,
@@ -161,7 +156,6 @@ const components = [
ElHeader, ElHeader,
ElMain, ElMain,
ElDatePicker, ElDatePicker,
ElDatePickerPanel,
ElDescriptions, ElDescriptions,
ElDescriptionsItem, ElDescriptionsItem,
ElDialog, ElDialog,
@@ -178,7 +172,6 @@ const components = [
ElImageViewer, ElImageViewer,
ElInput, ElInput,
ElInputNumber, ElInputNumber,
ElInputTag,
ElLink, ElLink,
ElMenu, ElMenu,
ElMenuItem, ElMenuItem,
@@ -230,21 +223,16 @@ const components = [
ElWatermark, ElWatermark,
ElTour, ElTour,
ElTourStep, ElTourStep,
ElAnchor, ElSegmented
ElAnchorLink,
ElSegmented,
ElMention,
ElSplitter,
ElSplitterPanel
]; ];
const plugins = [ const plugins = [
ElInfiniteScroll,
ElLoading, ElLoading,
ElInfiniteScroll,
ElPopoverDirective,
ElMessage, ElMessage,
ElMessageBox, ElMessageBox,
ElNotification, ElNotification
ElPopoverDirective
]; ];
/** 按需引入`element-plus` */ /** 按需引入`element-plus` */

View File

@@ -7,13 +7,7 @@ import { buildHierarchyTree } from "@/utils/tree";
import remainingRouter from "./modules/remaining"; import remainingRouter from "./modules/remaining";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/permission";
import { import { isUrl, openLink, storageLocal, isAllEmpty } from "@pureadmin/utils";
isUrl,
openLink,
cloneDeep,
isAllEmpty,
storageLocal
} from "@pureadmin/utils";
import { import {
ascending, ascending,
getTopMenu, getTopMenu,
@@ -27,9 +21,9 @@ import {
} from "./utils"; } from "./utils";
import { import {
type Router, type Router,
createRouter,
type RouteRecordRaw, type RouteRecordRaw,
type RouteComponent, type RouteComponent
createRouter
} from "vue-router"; } from "vue-router";
import { import {
type DataInfo, type DataInfo,
@@ -61,9 +55,6 @@ export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity)))) formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
); );
/** 初始的静态路由,用于退出登录时重置路由 */
const initConstantRoutes: Array<RouteRecordRaw> = cloneDeep(constantRoutes);
/** 用于渲染菜单,保持原始层级 */ /** 用于渲染菜单,保持原始层级 */
export const constantMenus: Array<RouteComponent> = ascending( export const constantMenus: Array<RouteComponent> = ascending(
routes.flat(Infinity) routes.flat(Infinity)
@@ -94,25 +85,20 @@ export const router: Router = createRouter({
} }
}); });
/** 记录已经加载的页面路径 */
const loadedPaths = new Set<string>();
/** 重置已加载页面记录 */
export function resetLoadedPaths() {
loadedPaths.clear();
}
/** 重置路由 */ /** 重置路由 */
export function resetRouter() { export function resetRouter() {
router.clearRoutes(); router.getRoutes().forEach(route => {
for (const route of initConstantRoutes.concat(...(remainingRouter as any))) { const { name, meta } = route;
router.addRoute(route); if (name && router.hasRoute(name) && meta?.backstage) {
} router.removeRoute(name);
router.options.routes = formatTwoStageRoutes( router.options.routes = formatTwoStageRoutes(
formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity)))) formatFlatteningRoutes(
); buildHierarchyTree(ascending(routes.flat(Infinity)))
)
);
}
});
usePermissionStoreHook().clearAllCachePage(); usePermissionStoreHook().clearAllCachePage();
resetLoadedPaths();
} }
/** 路由白名单 */ /** 路由白名单 */
@@ -121,12 +107,6 @@ const whiteList = ["/login"];
const { VITE_HIDE_HOME } = import.meta.env; const { VITE_HIDE_HOME } = import.meta.env;
router.beforeEach((to: ToRouteType, _from, next) => { router.beforeEach((to: ToRouteType, _from, next) => {
to.meta.loaded = loadedPaths.has(to.path);
if (!to.meta.loaded) {
NProgress.start();
}
if (to.meta?.keepAlive) { if (to.meta?.keepAlive) {
handleAliveRoute(to, "add"); handleAliveRoute(to, "add");
// 页面整体刷新和点击标签页刷新 // 页面整体刷新和点击标签页刷新
@@ -135,6 +115,7 @@ router.beforeEach((to: ToRouteType, _from, next) => {
} }
} }
const userInfo = storageLocal().getItem<DataInfo<number>>(userKey); const userInfo = storageLocal().getItem<DataInfo<number>>(userKey);
NProgress.start();
const externalLink = isUrl(to?.name as string); const externalLink = isUrl(to?.name as string);
if (!externalLink) { if (!externalLink) {
to.matched.some(item => { to.matched.some(item => {
@@ -220,8 +201,7 @@ router.beforeEach((to: ToRouteType, _from, next) => {
} }
}); });
router.afterEach(to => { router.afterEach(() => {
loadedPaths.add(to.path);
NProgress.done(); NProgress.done();
}); });

View File

@@ -119,7 +119,8 @@ export default {
name: "PureSlider", name: "PureSlider",
component: () => import("@/views/components/slider/index.vue"), component: () => import("@/views/components/slider/index.vue"),
meta: { meta: {
title: $t("menus.pureSlider") title: $t("menus.pureSlider"),
extraIcon: "IF-pure-iconfont-new svg"
} }
}, },
{ {
@@ -194,15 +195,6 @@ export default {
title: $t("menus.pureColorPicker") title: $t("menus.pureColorPicker")
} }
}, },
{
path: "/components/color-picker-panel",
name: "ColorPickerPanel",
component: () => import("@/views/components/color-picker-panel.vue"),
meta: {
title: $t("menus.pureColorPickerPanel"),
extraIcon: "IF-pure-iconfont-new svg"
}
},
{ {
path: "/components/selector", path: "/components/selector",
name: "Selector", name: "Selector",

View File

@@ -16,7 +16,7 @@ export default {
name: "403", name: "403",
component: () => import("@/views/error/403.vue"), component: () => import("@/views/error/403.vue"),
meta: { meta: {
title: $t("menus.pureAccessDenied") title: $t("menus.pureFourZeroOne")
} }
}, },
{ {
@@ -24,7 +24,7 @@ export default {
name: "404", name: "404",
component: () => import("@/views/error/404.vue"), component: () => import("@/views/error/404.vue"),
meta: { meta: {
title: $t("menus.purePageNotFound") title: $t("menus.pureFourZeroFour")
} }
}, },
{ {
@@ -32,7 +32,7 @@ export default {
name: "500", name: "500",
component: () => import("@/views/error/500.vue"), component: () => import("@/views/error/500.vue"),
meta: { meta: {
title: $t("menus.pureServerError") title: $t("menus.pureFive")
} }
} }
] ]

View File

@@ -8,27 +8,8 @@ export default [
component: () => import("@/views/login/index.vue"), component: () => import("@/views/login/index.vue"),
meta: { meta: {
title: $t("menus.pureLogin"), title: $t("menus.pureLogin"),
showLink: false showLink: false,
} rank: 101
},
// 全屏403无权访问页面
{
path: "/access-denied",
name: "AccessDenied",
component: () => import("@/views/error/403.vue"),
meta: {
title: $t("menus.pureAccessDenied"),
showLink: false
}
},
// 全屏500服务器出错页面
{
path: "/server-error",
name: "ServerError",
component: () => import("@/views/error/500.vue"),
meta: {
title: $t("menus.pureServerError"),
showLink: false
} }
}, },
{ {
@@ -36,7 +17,8 @@ export default [
component: Layout, component: Layout,
meta: { meta: {
title: $t("status.pureLoad"), title: $t("status.pureLoad"),
showLink: false showLink: false,
rank: 102
}, },
children: [ children: [
{ {
@@ -46,15 +28,6 @@ export default [
} }
] ]
}, },
{
path: "/account-settings",
name: "AccountSettings",
component: () => import("@/views/account-settings/index.vue"),
meta: {
title: $t("buttons.pureAccountSettings"),
showLink: false
}
},
// 下面是一个无layout菜单的例子一个全屏空白页面因为这种情况极少发生所以只需要在前端配置即可配置路径src/router/modules/remaining.ts // 下面是一个无layout菜单的例子一个全屏空白页面因为这种情况极少发生所以只需要在前端配置即可配置路径src/router/modules/remaining.ts
{ {
path: "/empty", path: "/empty",
@@ -62,7 +35,18 @@ export default [
component: () => import("@/views/empty/index.vue"), component: () => import("@/views/empty/index.vue"),
meta: { meta: {
title: $t("menus.pureEmpty"), title: $t("menus.pureEmpty"),
showLink: false showLink: false,
rank: 103
}
},
{
path: "/account-settings",
name: "AccountSettings",
component: () => import("@/views/account-settings/index.vue"),
meta: {
title: $t("buttons.pureAccountSettings"),
showLink: false,
rank: 104
} }
} }
] satisfies Array<RouteConfigsTable>; ] satisfies Array<RouteConfigsTable>;

View File

@@ -139,17 +139,12 @@ function findRouteByPath(path: string, routes: RouteRecordRaw[]) {
} }
} }
/** 动态路由注册完成后再添加全屏404页面不存在页面避免刷新动态路由页面时误跳转到404页面 */
function addPathMatch() { function addPathMatch() {
if (!router.hasRoute("pathMatch")) { if (!router.hasRoute("pathMatch")) {
router.addRoute({ router.addRoute({
path: "/:pathMatch(.*)*", path: "/:pathMatch(.*)",
name: "PageNotFound", name: "pathMatch",
component: () => import("@/views/error/404.vue"), redirect: "/error/404"
meta: {
title: "menus.purePageNotFound",
showLink: false
}
}); });
} }
} }
@@ -177,8 +172,6 @@ function handleAsyncRoutes(routeList) {
const flattenRouters: any = router const flattenRouters: any = router
.getRoutes() .getRoutes()
.find(n => n.path === "/"); .find(n => n.path === "/");
// 保持router.options.routes[0].children与path为"/"的children一致防止数据不一致导致异常
flattenRouters.children = router.options.routes[0].children;
router.addRoute(flattenRouters); router.addRoute(flattenRouters);
} }
} }
@@ -209,26 +202,18 @@ function initRouter() {
}); });
} else { } else {
return new Promise(resolve => { return new Promise(resolve => {
getAsyncRoutes().then(({ code, data }) => { getAsyncRoutes().then(({ data }) => {
if (code === 0) { handleAsyncRoutes(cloneDeep(data));
handleAsyncRoutes(cloneDeep(data)); storageLocal().setItem(key, data);
storageLocal().setItem(key, data); resolve(router);
resolve(router);
} else {
resolve(router);
}
}); });
}); });
} }
} else { } else {
return new Promise(resolve => { return new Promise(resolve => {
getAsyncRoutes().then(({ code, data }) => { getAsyncRoutes().then(({ data }) => {
if (code === 0) { handleAsyncRoutes(cloneDeep(data));
handleAsyncRoutes(cloneDeep(data)); resolve(router);
resolve(router);
} else {
resolve(router);
}
}); });
}); });
} }

View File

@@ -18,7 +18,7 @@ export const useAppStore = defineStore("pure-app", {
withoutAnimation: false, withoutAnimation: false,
isClickCollapse: false isClickCollapse: false
}, },
// 这里的layout用于监听容器拖拉后恢复对应的菜单布局 // 这里的layout用于监听容器拖拉后恢复对应的导航模式
layout: layout:
storageLocal().getItem<StorageConfigs>( storageLocal().getItem<StorageConfigs>(
`${responsiveStorageNameSpace()}layout` `${responsiveStorageNameSpace()}layout`

View File

@@ -21,7 +21,7 @@ export const useEpThemeStore = defineStore("pure-epTheme", {
getEpThemeColor(state) { getEpThemeColor(state) {
return state.epThemeColor; return state.epThemeColor;
}, },
/** 用于mix菜单布局下hamburger-svg的fill属性 */ /** 用于mix导航模式下hamburger-svg的fill属性 */
fill(state) { fill(state) {
if (state.epTheme === "light") { if (state.epTheme === "light") {
return "#409eff"; return "#409eff";

View File

@@ -80,15 +80,22 @@ export const useMultiTagsStore = defineStore("pure-multiTags", {
if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink)
return; return;
const tagPath = tagVal.path; const tagPath = tagVal.path;
// 判断tag是否已存在
const tagHasExits = this.multiTags.some(tag => { const tagHasExits = this.multiTags.some(tag => {
return ( return tag.path === tagPath;
tag.path === tagPath &&
isEqual(tag?.query, tagVal?.query) &&
isEqual(tag?.params, tagVal?.params)
);
}); });
if (tagHasExits) return; // 判断tag中的query键值是否相等
const tagQueryHasExits = this.multiTags.some(tag => {
return isEqual(tag?.query, tagVal?.query);
});
// 判断tag中的params键值是否相等
const tagParamsHasExits = this.multiTags.some(tag => {
return isEqual(tag?.params, tagVal?.params);
});
if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
// 动态路由可打开的最大数量 // 动态路由可打开的最大数量
const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1; const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;

View File

@@ -2,6 +2,7 @@ import { defineStore } from "pinia";
import { import {
type cacheType, type cacheType,
store, store,
debounce,
ascending, ascending,
getKeyList, getKeyList,
filterTree, filterTree,
@@ -32,35 +33,33 @@ export const usePermissionStore = defineStore("pure-permission", {
this.constantMenus.concat(routes) as any this.constantMenus.concat(routes) as any
); );
}, },
/** 监听缓存页面是否存在于标签页,不存在则删除 */
clearCache() {
let cacheLength = this.cachePageList.length;
const nameList = getKeyList(useMultiTagsStoreHook().multiTags, "name");
while (cacheLength > 0) {
nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) ===
-1 &&
this.cachePageList.splice(
this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
1
);
cacheLength--;
}
},
cacheOperate({ mode, name }: cacheType) { cacheOperate({ mode, name }: cacheType) {
const delIndex = this.cachePageList.findIndex(v => v === name); const delIndex = this.cachePageList.findIndex(v => v === name);
switch (mode) { switch (mode) {
case "refresh": case "refresh":
this.cachePageList = this.cachePageList.filter(v => v !== name); this.cachePageList = this.cachePageList.filter(v => v !== name);
this.clearCache();
break; break;
case "add": case "add":
this.cachePageList.push(name); this.cachePageList.push(name);
break; break;
case "delete": case "delete":
delIndex !== -1 && this.cachePageList.splice(delIndex, 1); delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
this.clearCache();
break; break;
} }
/** 监听缓存页面是否存在于标签页,不存在则删除 */
debounce(() => {
let cacheLength = this.cachePageList.length;
const nameList = getKeyList(useMultiTagsStoreHook().multiTags, "name");
while (cacheLength > 0) {
nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) ===
-1 &&
this.cachePageList.splice(
this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
1
);
cacheLength--;
}
})();
}, },
/** 清空缓存页面 */ /** 清空缓存页面 */
clearAllCachePage() { clearAllCachePage() {

View File

@@ -80,12 +80,8 @@ export const useUserStore = defineStore("pure-user", {
return new Promise<UserResult>((resolve, reject) => { return new Promise<UserResult>((resolve, reject) => {
getLogin(data) getLogin(data)
.then(data => { .then(data => {
if (data.code === 0) { if (data?.success) setToken(data.data);
setToken(data.data); resolve(data);
resolve(data);
} else {
reject(data.message);
}
}) })
.catch(error => { .catch(error => {
reject(error); reject(error);
@@ -107,11 +103,9 @@ export const useUserStore = defineStore("pure-user", {
return new Promise<RefreshTokenResult>((resolve, reject) => { return new Promise<RefreshTokenResult>((resolve, reject) => {
refreshTokenApi(data) refreshTokenApi(data)
.then(data => { .then(data => {
if (data.code === 0) { if (data) {
setToken(data.data); setToken(data.data);
resolve(data); resolve(data);
} else {
reject(data.message);
} }
}) })
.catch(error => { .catch(error => {

View File

@@ -135,6 +135,17 @@ html.dark {
} }
} }
/* 系统配置面板 */
.right-panel-items {
.el-divider__text {
--el-bg-color: var(--el-bg-color);
}
.el-divider--horizontal {
border-top: none;
}
}
/* 表单设计器 */ /* 表单设计器 */
.design-form { .design-form {
.el-main.config-content, .el-main.config-content,

View File

@@ -35,18 +35,3 @@
.html-weakness { .html-weakness {
filter: invert(80%); filter: invert(80%);
} }
/* 轻微缩小,再恢复原状的平滑缩放动画 */
@keyframes pure-scale-bounce {
0% {
transform: scale(1);
}
50% {
transform: scale(0.9);
}
100% {
transform: scale(1);
}
}

View File

@@ -34,14 +34,12 @@
} }
.set-icon, .set-icon,
.fullscreen-icon, .fullscreen-icon {
.globalization-icon {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 40px; width: 40px;
height: 48px; height: 48px;
font-size: 16px;
cursor: pointer; cursor: pointer;
} }
@@ -174,6 +172,10 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: var(--pure-theme-sub-menu-active-text) !important; color: var(--pure-theme-sub-menu-active-text) !important;
i {
color: var(--pure-theme-sub-menu-active-text) !important;
}
} }
.is-active { .is-active {
@@ -268,6 +270,10 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: var(--pure-theme-sub-menu-active-text) !important; color: var(--pure-theme-sub-menu-active-text) !important;
i {
color: var(--pure-theme-sub-menu-active-text) !important;
}
} }
/* 子菜单中还有子菜单 */ /* 子菜单中还有子菜单 */
@@ -368,6 +374,10 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: var(--pure-theme-sub-menu-active-text) !important; color: var(--pure-theme-sub-menu-active-text) !important;
i {
color: var(--pure-theme-sub-menu-active-text) !important;
}
} }
.nest-menu .el-sub-menu > .el-sub-menu__title, .nest-menu .el-sub-menu > .el-sub-menu__title,
@@ -451,7 +461,7 @@
/* 搜索 */ /* 搜索 */
.search-container, .search-container,
/* 国际化 */ /* 国际化 */
.globalization-icon, .globalization,
/* 全屏 */ /* 全屏 */
.fullscreen-icon, .fullscreen-icon,
/* 消息通知 */ /* 消息通知 */
@@ -470,8 +480,12 @@
color: var(--pure-theme-sub-menu-active-text); color: var(--pure-theme-sub-menu-active-text);
} }
.globalization-icon { .globalization {
width: 40px;
height: 48px;
padding: 11px;
color: var(--pure-theme-sub-menu-active-text); color: var(--pure-theme-sub-menu-active-text);
cursor: pointer;
outline: none; outline: none;
} }
@@ -527,6 +541,10 @@
.is-active > .el-sub-menu__title, .is-active > .el-sub-menu__title,
.is-active.submenu-title-noDropdown { .is-active.submenu-title-noDropdown {
color: var(--pure-theme-sub-menu-active-text) !important; color: var(--pure-theme-sub-menu-active-text) !important;
i {
color: var(--pure-theme-sub-menu-active-text) !important;
}
} }
.is-active { .is-active {
@@ -628,7 +646,7 @@ body[layout="vertical"] {
/* 搜索 */ /* 搜索 */
.search-container, .search-container,
/* 国际化 */ /* 国际化 */
.globalization-icon, .globalization,
/* 全屏 */ /* 全屏 */
.fullscreen-icon, .fullscreen-icon,
/* 消息通知 */ /* 消息通知 */
@@ -648,10 +666,6 @@ body[layout="horizontal"] {
@include merge-style($sideBarWidth); @include merge-style($sideBarWidth);
.el-menu {
--el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
}
.fixed-header, .fixed-header,
.main-container { .main-container {
transition: none !important; transition: none !important;
@@ -673,7 +687,6 @@ body[layout="mix"] {
.el-menu { .el-menu {
--el-menu-hover-bg-color: transparent !important; --el-menu-hover-bg-color: transparent !important;
--el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
} }
.hideSidebar { .hideSidebar {

View File

@@ -42,9 +42,5 @@
} }
@utility navbar-bg-hover { @utility navbar-bg-hover {
@apply select-none dark:text-white dark:hover:bg-[#242424]!; @apply dark:text-white dark:hover:bg-[#242424]!;
}
@utility animate-scale-bounce {
animation: pure-scale-bounce 0.3s ease-in-out;
} }

View File

@@ -10,8 +10,7 @@ import type {
PureHttpRequestConfig PureHttpRequestConfig
} from "./types.d"; } from "./types.d";
import { stringify } from "qs"; import { stringify } from "qs";
import { message } from "@/utils/message"; import NProgress from "../progress";
import { $t, transformI18n } from "@/plugins/i18n";
import { getToken, formatToken } from "@/utils/auth"; import { getToken, formatToken } from "@/utils/auth";
import { useUserStoreHook } from "@/store/modules/user"; import { useUserStoreHook } from "@/store/modules/user";
@@ -62,6 +61,8 @@ class PureHttp {
private httpInterceptorsRequest(): void { private httpInterceptorsRequest(): void {
PureHttp.axiosInstance.interceptors.request.use( PureHttp.axiosInstance.interceptors.request.use(
async (config: PureHttpRequestConfig): Promise<any> => { async (config: PureHttpRequestConfig): Promise<any> => {
// 开启进度条动画
NProgress.start();
// 优先判断post/get等方法是否传入回调否则执行初始化设置等回调 // 优先判断post/get等方法是否传入回调否则执行初始化设置等回调
if (typeof config.beforeRequestCallback === "function") { if (typeof config.beforeRequestCallback === "function") {
config.beforeRequestCallback(config); config.beforeRequestCallback(config);
@@ -92,13 +93,6 @@ class PureHttp {
PureHttp.requests.forEach(cb => cb(token)); PureHttp.requests.forEach(cb => cb(token));
PureHttp.requests = []; PureHttp.requests = [];
}) })
.catch(_err => {
PureHttp.requests = [];
useUserStoreHook().logOut();
message(transformI18n($t("login.pureLoginExpired")), {
type: "warning"
});
})
.finally(() => { .finally(() => {
PureHttp.isRefreshing = false; PureHttp.isRefreshing = false;
}); });
@@ -127,6 +121,8 @@ class PureHttp {
instance.interceptors.response.use( instance.interceptors.response.use(
(response: PureHttpResponse) => { (response: PureHttpResponse) => {
const $config = response.config; const $config = response.config;
// 关闭进度条动画
NProgress.done();
// 优先判断post/get等方法是否传入回调否则执行初始化设置等回调 // 优先判断post/get等方法是否传入回调否则执行初始化设置等回调
if (typeof $config.beforeResponseCallback === "function") { if (typeof $config.beforeResponseCallback === "function") {
$config.beforeResponseCallback(response); $config.beforeResponseCallback(response);
@@ -141,6 +137,8 @@ class PureHttp {
(error: PureHttpError) => { (error: PureHttpError) => {
const $error = error; const $error = error;
$error.isCancelRequest = Axios.isCancel($error); $error.isCancelRequest = Axios.isCancel($error);
// 关闭进度条动画
NProgress.done();
// 所有的响应异常 区分来源为取消请求/非取消请求 // 所有的响应异常 区分来源为取消请求/非取消请求
return Promise.reject($error); return Promise.reject($error);
} }

View File

@@ -65,7 +65,8 @@ interface LocalForageDbMethodsOptional {
} }
interface LocalForageDriverDbMethods interface LocalForageDriverDbMethods
extends LocalForageDbMethodsCore, LocalForageDriverMethodsOptional {} extends LocalForageDbMethodsCore,
LocalForageDriverMethodsOptional {}
interface LocalForageDriverSupportFunc { interface LocalForageDriverSupportFunc {
(): Promise<boolean>; (): Promise<boolean>;
@@ -93,7 +94,8 @@ interface LocalForageSerializer {
} }
interface LocalForageDbMethods interface LocalForageDbMethods
extends LocalForageDbMethodsCore, LocalForageDbMethodsOptional {} extends LocalForageDbMethodsCore,
LocalForageDbMethodsOptional {}
export interface LocalForage extends LocalForageDbMethods { export interface LocalForage extends LocalForageDbMethods {
LOCALSTORAGE: string; LOCALSTORAGE: string;

View File

@@ -4,19 +4,10 @@ import { type MessageHandler, ElMessage } from "element-plus";
type messageStyle = "el" | "antd"; type messageStyle = "el" | "antd";
type messageTypes = "info" | "success" | "warning" | "error"; type messageTypes = "info" | "success" | "warning" | "error";
type messagePlacement =
| "top"
| "top-left"
| "top-right"
| "bottom"
| "bottom-left"
| "bottom-right";
interface MessageParams { interface MessageParams {
/** 消息类型,可选 `info` 、`success` 、`warning` 、`error` ,默认 `info` */ /** 消息类型,可选 `info` 、`success` 、`warning` 、`error` ,默认 `info` */
type?: messageTypes; type?: messageTypes;
/** 是否纯色,默认 `false` */
plain?: boolean;
/** 自定义图标,该属性会覆盖 `type` 的图标 */ /** 自定义图标,该属性会覆盖 `type` 的图标 */
icon?: any; icon?: any;
/** 是否将 `message` 属性作为 `HTML` 片段处理,默认 `false` */ /** 是否将 `message` 属性作为 `HTML` 片段处理,默认 `false` */
@@ -27,16 +18,14 @@ interface MessageParams {
duration?: number; duration?: number;
/** 是否显示关闭按钮,默认值 `false` */ /** 是否显示关闭按钮,默认值 `false` */
showClose?: boolean; showClose?: boolean;
/** `Message` 消息距离窗口边缘的偏移量,默认 `16` */ /** 文字是否居中,默认 `false` */
center?: boolean;
/** `Message` 距离窗口顶部的偏移量,默认 `20` */
offset?: number; offset?: number;
/** `Message` 消息放置位置,默认 `top` */
placement?: messagePlacement;
/** 设置组件的根元素,默认 `document.body` */ /** 设置组件的根元素,默认 `document.body` */
appendTo?: string | HTMLElement; appendTo?: string | HTMLElement;
/** 合并内容相同的消息,不支持 `VNode` 类型的消息,默认值 `false` */ /** 合并内容相同的消息,不支持 `VNode` 类型的消息,默认值 `false` */
grouping?: boolean; grouping?: boolean;
/** 重复次数,类似于 `Badge` 。当和 `grouping` 属性一起使用时作为初始数量使用,默认值 `1` */
repeatNum?: number;
/** 关闭时的回调函数, 参数为被关闭的 `message` 实例 */ /** 关闭时的回调函数, 参数为被关闭的 `message` 实例 */
onClose?: Function | null; onClose?: Function | null;
} }
@@ -59,32 +48,28 @@ const message = (
const { const {
icon, icon,
type = "info", type = "info",
plain = false,
dangerouslyUseHTMLString = false, dangerouslyUseHTMLString = false,
customClass = "antd", customClass = "antd",
duration = 2000, duration = 2000,
showClose = false, showClose = false,
offset = 16, center = false,
placement = "top", offset = 20,
appendTo = document.body, appendTo = document.body,
grouping = false, grouping = false,
repeatNum = 1,
onClose onClose
} = params; } = params;
return ElMessage({ return ElMessage({
message, message,
icon,
type, type,
plain, icon,
dangerouslyUseHTMLString, dangerouslyUseHTMLString,
duration, duration,
showClose, showClose,
center,
offset, offset,
placement,
appendTo, appendTo,
grouping, grouping,
repeatNum,
// 全局搜 pure-message 即可知道该类的样式位置 // 全局搜 pure-message 即可知道该类的样式位置
customClass: customClass === "antd" ? "pure-message" : "", customClass: customClass === "antd" ? "pure-message" : "",
onClose: () => (isFunction(onClose) ? onClose() : null) onClose: () => (isFunction(onClose) ? onClose() : null)

View File

@@ -19,8 +19,8 @@ export const injectResponsiveStorage = (app: App, config: PlatformConfigs) => {
darkMode: config.DarkMode ?? false, darkMode: config.DarkMode ?? false,
sidebarStatus: config.SidebarStatus ?? true, sidebarStatus: config.SidebarStatus ?? true,
epThemeColor: config.EpThemeColor ?? "#409EFF", epThemeColor: config.EpThemeColor ?? "#409EFF",
themeColor: config.Theme ?? "light", // 主题色对应系统配置中的主题色与theme不同的是它不会受到浅色、深色主题模式切换的影响,只会在手动点击主题色时改变) themeColor: config.Theme ?? "light", // 主题色对应系统配置中的主题色与theme不同的是它不会受到浅色、深色整体风格切换的影响,只会在手动点击主题色时改变)
themeMode: config.ThemeMode ?? "light" // 主题模式浅色light、深色dark、自动system overallStyle: config.OverallStyle ?? "light" // 整体风格浅色light、深色dark、自动system
}, },
// 系统配置-界面显示 // 系统配置-界面显示
configure: Storage.getData("configure", nameSpace) ?? { configure: Storage.getData("configure", nameSpace) ?? {

View File

@@ -76,7 +76,7 @@ function onReset() {
immediate: true, immediate: true,
timeout: 1000 timeout: 1000
}" }"
class="w-50!" class="w-[200px]!"
clearable clearable
@clear="onInput" @clear="onInput"
/> />
@@ -86,7 +86,7 @@ function onReset() {
<el-input <el-input
v-model="searchTwo" v-model="searchTwo"
v-optimize="{ event: 'input', fn: onInputTwo, timeout: 400 }" v-optimize="{ event: 'input', fn: onInputTwo, timeout: 400 }"
class="w-50!" class="w-[200px]!"
clearable clearable
/> />
</div> </div>
@@ -100,7 +100,7 @@ function onReset() {
timeout: 400, timeout: 400,
params: { name: '小明', sex: '男' } params: { name: '小明', sex: '男' }
}" }"
class="w-50!" class="w-[200px]!"
clearable clearable
/> />
</div> </div>
@@ -112,7 +112,7 @@ function onReset() {
<el-input <el-input
v-model="searchFour" v-model="searchFour"
v-optimize:throttle="{ event: 'input', fn: onInputFour, timeout: 1000 }" v-optimize:throttle="{ event: 'input', fn: onInputFour, timeout: 1000 }"
class="w-50!" class="w-[200px]!"
clearable clearable
/> />
</div> </div>
@@ -125,7 +125,7 @@ function onReset() {
fn: onInputFive, fn: onInputFive,
params: { name: '小明', sex: '男' } params: { name: '小明', sex: '男' }
}" }"
class="w-50!" class="w-[200px]!"
clearable clearable
/> />
</div> </div>
@@ -134,7 +134,7 @@ function onReset() {
<div class="mb-2"> <div class="mb-2">
文本复制指令(双击输入框内容即可复制) 文本复制指令(双击输入框内容即可复制)
<el-input v-model="searchSix" v-copy="searchSix" class="w-50!" /> <el-input v-model="searchSix" v-copy="searchSix" class="w-[200px]!" />
</div> </div>
<div> <div>
文本复制指令(自定义触发事件,单击复制) 文本复制指令(自定义触发事件,单击复制)

View File

@@ -89,7 +89,7 @@ const exportExcel = () => {
</el-link> </el-link>
</template> </template>
<el-button type="primary" @click="exportExcel">导出Excel</el-button> <el-button type="primary" @click="exportExcel">导出Excel</el-button>
<div class="h-100 mt-3"> <div class="h-[25rem] mt-3">
<el-auto-resizer> <el-auto-resizer>
<template #default="{ height, width }"> <template #default="{ height, width }">
<el-table-v2 <el-table-v2

View File

@@ -39,12 +39,12 @@ const dataProps = {
</template> </template>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="mb-5"> <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="mb-[20px]">
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<div class="card-header">普通树结构</div> <div class="card-header">普通树结构</div>
</template> </template>
<div class="max-h-137.5 overflow-y-auto"> <div class="max-h-[550px] overflow-y-auto">
<el-tree <el-tree
:data="menusData" :data="menusData"
:props="dataProps" :props="dataProps"
@@ -71,7 +71,7 @@ const dataProps = {
<template #header> <template #header>
<div class="card-header">虚拟树结构</div> <div class="card-header">虚拟树结构</div>
</template> </template>
<div class="max-h-137.5 overflow-y-auto"> <div class="max-h-[550px] overflow-y-auto">
<el-tree-v2 <el-tree-v2
:data="menusData" :data="menusData"
:props="dataProps" :props="dataProps"

View File

@@ -194,7 +194,7 @@ onUnmounted(() => {
基于 基于
<el-link <el-link
type="primary" type="primary"
underline="never" :underline="false"
href="https://github.com/mqttjs/MQTT.js" href="https://github.com/mqttjs/MQTT.js"
target="_blank" target="_blank"
> >
@@ -203,7 +203,7 @@ onUnmounted(() => {
免费的公共MQTT代理 免费的公共MQTT代理
<el-link <el-link
type="primary" type="primary"
underline="never" :underline="false"
href="broker.emqx.io" href="broker.emqx.io"
target="_blank" target="_blank"
> >

View File

@@ -59,7 +59,7 @@ const onPrint = () => {
class="h-[calc(100vh-295px)]" class="h-[calc(100vh-295px)]"
:element-loading-text="t('status.pureLoad')" :element-loading-text="t('status.pureLoad')"
> >
<div class="flex-bc h-9"> <div class="flex justify-between items-center h-9">
<div v-if="showAllPages" class="font-medium ml-1.25 text-xl"> <div v-if="showAllPages" class="font-medium ml-1.25 text-xl">
{{ pageCount }} {{ pageCount }}
</div> </div>
@@ -74,7 +74,7 @@ const onPrint = () => {
{{ currentPage }} / {{ pageCount }} {{ currentPage }} / {{ pageCount }}
</el-pagination> </el-pagination>
</div> </div>
<div class="w-42.5 flex-bc"> <div class="w-[170px] flex-bc">
<el-checkbox v-model="showAllPages" @change="showAllPagesChange"> <el-checkbox v-model="showAllPages" @change="showAllPagesChange">
显示所有页面 显示所有页面
</el-checkbox> </el-checkbox>

View File

@@ -83,7 +83,7 @@ const tableData: User[] = [
<span class="font-medium">打印功能报表图表图片</span> <span class="font-medium">打印功能报表图表图片</span>
<el-select <el-select
v-model="value" v-model="value"
class="w-25! mr-2" class="w-[100px]! mr-2"
placeholder="Select" placeholder="Select"
size="small" size="small"
> >
@@ -131,7 +131,7 @@ const tableData: User[] = [
border border
:data="tableData" :data="tableData"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
class="el-table w-full mt-2.5" class="el-table w-full mt-[10px]"
> >
<el-table-column prop="date" label="Date" /> <el-table-column prop="date" label="Date" />
<el-table-column prop="name" label="Name" /> <el-table-column prop="name" label="Name" />
@@ -160,7 +160,7 @@ const tableData: User[] = [
}" }"
> >
<p class="font-medium text-lg text-center">Echart</p> <p class="font-medium text-lg text-center">Echart</p>
<pieChart class="echart mt-2.5" /> <pieChart class="echart mt-[10px]" />
</el-col> </el-col>
<el-col <el-col
@@ -186,7 +186,7 @@ const tableData: User[] = [
<img <img
src="https://pure-admin-utils.netlify.app/logo.png" src="https://pure-admin-utils.netlify.app/logo.png"
alt="avatars" alt="avatars"
class="img mt-2.5 m-auto" class="img mt-[10px] m-auto"
/> />
</el-col> </el-col>
</el-row> </el-row>

View File

@@ -46,19 +46,19 @@ const disabledClick = () => {
</template> </template>
<el-row :gutter="20" justify="space-between"> <el-row :gutter="20" justify="space-between">
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">基础用法</div> <div class="font-bold">基础用法</div>
<ReQrcode :text="qrcodeText" /> <ReQrcode :text="qrcodeText" />
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">img标签</div> <div class="font-bold">img标签</div>
<ReQrcode :text="qrcodeText" tag="img" /> <ReQrcode :text="qrcodeText" tag="img" />
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">样式配置</div> <div class="font-bold">样式配置</div>
<ReQrcode <ReQrcode
:text="qrcodeText" :text="qrcodeText"
@@ -72,19 +72,19 @@ const disabledClick = () => {
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">点击事件</div> <div class="font-bold">点击事件</div>
<ReQrcode :text="qrcodeText" @click="codeClick" /> <ReQrcode :text="qrcodeText" @click="codeClick" />
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">异步内容</div> <div class="font-bold">异步内容</div>
<ReQrcode :text="asyncTitle" /> <ReQrcode :text="asyncTitle" />
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">失效</div> <div class="font-bold">失效</div>
<ReQrcode <ReQrcode
:text="qrcodeText" :text="qrcodeText"
@@ -94,7 +94,7 @@ const disabledClick = () => {
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">logo配置</div> <div class="font-bold">logo配置</div>
<ReQrcode <ReQrcode
:text="qrcodeText" :text="qrcodeText"
@@ -103,7 +103,7 @@ const disabledClick = () => {
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">logo样式</div> <div class="font-bold">logo样式</div>
<ReQrcode <ReQrcode
:text="qrcodeText" :text="qrcodeText"
@@ -118,7 +118,7 @@ const disabledClick = () => {
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24"> <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-2.5 text-center"> <el-card shadow="hover" class="mb-[10px] text-center">
<div class="font-bold">大小配置</div> <div class="font-bold">大小配置</div>
<ReQrcode :text="qrcodeText" :width="100" /> <ReQrcode :text="qrcodeText" :width="100" />
</el-card> </el-card>

View File

@@ -30,7 +30,7 @@ defineOptions({
<el-button v-ripple type="warning">Warning</el-button> <el-button v-ripple type="warning">Warning</el-button>
<el-button v-ripple type="danger">Danger</el-button> <el-button v-ripple type="danger">Danger</el-button>
</el-space> </el-space>
<el-card v-ripple class="mb-5 w-127.5 select-none" shadow="hover"> <el-card v-ripple class="mb-5 w-[510px] select-none" shadow="hover">
卡片 卡片
</el-card> </el-card>

Some files were not shown because too many files have changed in this diff Show More