Compare commits

..

86 Commits

Author SHA1 Message Date
xiaoxian521
cd21f1e050 release: update 5.8.0 2024-08-19 13:53:33 +08:00
xiaoxian521
5fbb664da7 chore: 升级依赖,element-plus最新版兼容处理 2024-08-12 14:51:34 +08:00
xiaoming
244ab7f990 feat: 新增第二种按钮权限指令(根据登录接口返回的permissions字段进行判断) (#1177)
* feat: 新增第二种按钮权限指令(根据登录接口返回的`permissions`字段进行判断)
2024-08-12 13:32:04 +08:00
xiaoxian521
96152ed134 feat: ReDialog组件的确定按钮提供关闭按钮动画closeLoading功能 2024-08-05 13:15:10 +08:00
xiaoxian521
37ab40f188 feat: VxeTableBar组件添加全屏和退出全屏功能 2024-08-03 15:13:20 +08:00
xiaoxian521
91ae63a8c5 feat: PureTableBar组件添加全屏和退出全屏功能 2024-08-03 14:39:21 +08:00
xiaoxian521
6d7e92fed1 feat: 函数式弹框ReDialog添加点击确认按钮后是否开启loading加载动画功能 2024-07-30 14:56:47 +08:00
xiaoxian521
0706f37254 fix: 修复顶部菜单模式下logo不可隐藏的问题 2024-07-29 10:52:12 +08:00
xiaoxian521
8a9695cf7c chore(deps): update 2024-07-29 09:49:38 +08:00
xiaoxian521
d395c9c6ba chore(deps): update 2024-07-21 17:09:05 +08:00
xiaoxian521
3dec3c002f perf: 优化系统管理-角色管理的权限功能样式 2024-07-04 11:14:22 +08:00
xiaoxian521
bae1122e58 feat: 添加vite-plugin-checker插件,更严格的类型和eslint校验 2024-07-03 11:31:37 +08:00
xiaoxian521
37e9d8a1ac chore: 升级依赖,相关兼容处理 2024-07-02 20:57:35 +08:00
sea
dea9664677 perf: 手机端层级展示 (#1169) 2024-07-02 15:30:27 +08:00
sea
775d7a2d32 perf: 优化登录页 (#1168) 2024-06-27 09:55:47 +08:00
xiaoxian521
13e7a13e9d chore(deps): update 2024-06-14 14:01:18 +08:00
xiaoxian521
47afa9209e fix: 修复配置路由属性fixedTagfalse后当前标签页不可关闭的问题 2024-06-12 14:56:09 +08:00
xiaoxian521
933ced4ac4 docs: update 2024-06-11 22:28:57 +08:00
Fifteen
8816e61e3a chore: update plugins/elementPlus.ts (#1164) 2024-06-07 10:38:19 +08:00
sea
edf82ea727 feat: 添加开发环境代码调试vite-plugin-vue-inspector插件,提升开发体验 (#1162) 2024-06-06 17:32:25 +08:00
sea
a75cf8394e types: 优化自定义指令的类型提示 (#1161) 2024-06-06 16:26:32 +08:00
xiaoxian521
33a89834d7 release: update 5.7.0 2024-06-04 16:21:22 +08:00
xiaoxian521
649aab9c7d docs: 更新特别代码贡献名单 2024-06-04 13:49:52 +08:00
way
7a6ee58e6d feat: 添加谷歌风格的页签 (#1160) 2024-06-04 13:44:47 +08:00
xiaoxian521
b402a8924f docs: update 2024-06-01 06:33:55 +08:00
xiaoxian521
9a5523d1c7 chore: 更新依赖,建议升级vue-pdf-embed至最新版 2024-05-31 14:30:00 +08:00
xiaoxian521
1e6d0283c9 docs: update 2024-05-29 11:06:01 +08:00
xiaoxian521
a8377f8d45 fix: 修复在火狐浏览器中菜单折叠后,文字超出未隐藏的问题 2024-05-28 12:19:18 +08:00
xiaoxian521
cd653c83f0 chore: 升级依赖,相关兼容处理 2024-05-28 10:16:09 +08:00
xiaoxian521
643b36fc42 docs: update README 2024-05-28 00:04:35 +08:00
RosyCloudsLee
17ed4d640d types: update 2024-05-21 09:36:14 +08:00
xiaoxian521
613d20fc1b release: update 5.6.0 2024-05-14 09:55:45 +08:00
xiaoxian521
8934499349 chore(deps): update 2024-05-14 09:32:40 +08:00
xiaoxian521
bb86962186 chore: 升级pnpmv9版本,相关兼容处理 2024-05-13 22:45:19 +08:00
xiaoxian521
30f598dfa5 chore: update 2024-05-09 21:43:20 +08:00
xiaoxian521
de00537fdd chore(deps): update 2024-05-09 10:37:19 +08:00
Fifteen
5238ee7ad9 perf: 优化ReSegmented组件 (#1137) 2024-05-08 17:41:04 +08:00
一万
3ca9a7b5bc fix: 修复点击外链会跳转两次的问题 (#1133) 2024-05-08 15:59:32 +08:00
xiaoxian521
fae4924102 release: update 5.5.0 2024-05-07 09:09:35 +08:00
xiaoxian521
295240f2a3 chore(deps): update 2024-05-06 16:21:14 +08:00
xiaoxian521
1d9f1cf465 docs: 更换文档站和完整版预览站地址 2024-05-03 00:00:35 +08:00
xiaoxian521
a56061ac81 chore: 更新依赖,相关兼容处理 2024-05-02 22:39:18 +08:00
xiaoxian521
d24f334a81 ci: add pages.yml 2024-05-02 21:45:57 +08:00
xiaoming
cc7726e1c2 feat: 新组件ReVxeTableBar搭配vxe-table使用 (#1087) 2024-05-02 21:34:16 +08:00
xiaoming
b8159a0d73 refactor: 重构layout文件命名规范,更易读 (#1110) 2024-04-30 22:27:54 +08:00
一万
2f9bc7e187 fix: 修复函数式弹窗点击取消按钮,延时关闭无效问题 (#1112) 2024-04-26 15:20:54 +08:00
Nexpro
d6f487a48c chore: revise typo (#1103) 2024-04-26 10:59:48 +08:00
xiaoxian521
75dc3b6216 chore(deps): update 2024-04-25 11:40:17 +08:00
xiaoxian521
4be7db4944 chore: update 2024-04-24 16:25:12 +08:00
xiaoxian521
884cf92640 chore(deps): update 2024-04-24 11:19:51 +08:00
苗大
fb0c092a2c style: update 2024-04-23 11:35:11 +08:00
xiaoxian521
1ce0038c13 chore: update 2024-04-23 10:26:26 +08:00
xiaoxian521
88d804df89 chore: update 2024-04-22 13:09:32 +08:00
xiaoxian521
efe0c83e4f chore: 升级依赖,相关兼容处理 2024-04-22 12:27:53 +08:00
shuTwT
ada3e80c7e perf: 优化账号设置-头像上传功能 2024-04-19 10:52:39 +08:00
xiaoxian521
d203222acf release: update 5.4.0 2024-04-18 15:34:36 +08:00
xiaoxian521
07ad01ebee style: update 2024-04-18 13:47:13 +08:00
xiaoxian521
ed71fe708d chore: update 2024-04-18 12:20:08 +08:00
xiaoxian521
29b06c5285 chore(deps): update 2024-04-17 18:37:45 +08:00
fangcy
9ad00d97ee fix: 修复调用刷新token接口时,refreshToken参数为空的问题 2024-04-17 18:17:39 +08:00
xiaoming
a402d33b89 perf: 框架核心代码国际化全量覆盖(仅需处理业务代码国际化即可) (#1082) 2024-04-17 15:41:37 +08:00
xiaoxian521
d1d2bcaa11 feat: 添加全局配置MaxTagsLevel属性,可设置打开标签页最大数 2024-04-16 19:34:57 +08:00
xiaoxian521
abd042afe8 types: 优src/utils/http文件中postget工具函数的类型 2024-04-16 14:01:36 +08:00
xiaoxian521
cd42dbf188 chore: 移除非必要的cloc工具依赖包,它使用GPL开源许可证具有争议性 2024-04-16 11:59:11 +08:00
xiaoxian521
4cbf9056b1 perf: 简化store文件中导出和导入用法 2024-04-16 11:49:15 +08:00
xiaoxian521
5d3a9dff46 fix: 修复账户设置页面,刷新后字体颜色未生效的问题 2024-04-15 17:52:51 +08:00
xiaoxian521
dbb05f4166 fix: 修复三级菜单向左折叠后图标显示样式问题 2024-04-15 16:25:01 +08:00
xiaoxian521
ea36e260e2 fix: 修复当一个页面存在多个RePureTableBar组件,列无法正常拖动问题 2024-04-15 12:52:01 +08:00
xiaoxian521
a5b57908ec perf: 优化请求白名单逻辑,兼容更多场景 2024-04-15 11:40:15 +08:00
xiaoxian521
699b174f95 perf: 优化获取顶级菜单逻辑 2024-04-15 11:15:57 +08:00
xiaoxian521
0934c97413 chore: 升级eslint9,相关兼容处理 2024-04-13 11:21:06 +08:00
xiaoxian521
0dc979eec0 chore(deps): update 2024-04-13 09:37:18 +08:00
xiaoxian521
7ed0e8f89f docs: 更新特别代码贡献名单 2024-04-12 21:34:45 +08:00
EchoByte
332678ba88 feat: 添加账户设置功能页面且兼容移动端 (#1022) 2024-04-12 16:20:33 +08:00
xiaoming
296db3789b feat: 路由添加可配置的fixedTag属性,作用为当前菜单名称是否固定显示在标签页且不可关闭 (#1047) 2024-04-09 17:07:05 +08:00
xiaoxian521
c0a1b918aa feat: pure-table添加headerSlot自定义表头插槽用法示例 2024-04-06 12:25:13 +08:00
xiaoxian521
bf874276f3 chore(deps): update 2024-04-06 10:44:08 +08:00
hb0730
f120467fc8 feat: 函数式弹框ReDialog添加Popconfirm气泡确认框 (#1046) 2024-04-04 22:14:24 +08:00
xiaoxian521
8d2ef1f644 perf: 优化登录接口 2024-04-04 15:23:02 +08:00
hb0730
fcd0fc9d65 workflow: update node-version (#1051) 2024-04-03 12:23:16 +08:00
xiaoxian521
d685a18b9e feat: 添加思维导图示例 2024-03-31 14:38:15 +08:00
hb0730
e0f52fc379 feat: 分段控制器组件添加全局禁用属性disabled (#1043)
* feat: segmented component global disabled
2024-03-31 12:37:10 +08:00
xiaoxian521
53e3e601fb chore: 升级依赖,相关兼容处理 2024-03-30 23:45:56 +08:00
xiaoxian521
adc82644cb chore(deps): update 2024-03-29 20:17:51 +08:00
xiaoxian521
ee89a864db chore(deps): update 2024-03-29 10:11:06 +08:00
Fifteen
75fad304e7 chore: revise typo (#1039) 2024-03-29 10:06:35 +08:00
213 changed files with 11755 additions and 7528 deletions

View File

@@ -1,13 +0,0 @@
public
dist
*.d.ts
/src/assets
package.json
eslint.config.js
.prettierrc.js
commitlint.config.js
postcss.config.js
tailwind.config.ts
stylelint.config.js
src/components/ReSplitPane/iconfont
src/components/ReFlowChart/src/assets/iconfont

View File

@@ -32,7 +32,7 @@ body:
label: 验证 (Verify) label: 验证 (Verify)
description: 在提交问题之前,请确保您执行以下操作 (Before submitting an issue, please ensure you do the following) description: 在提交问题之前,请确保您执行以下操作 (Before submitting an issue, please ensure you do the following)
options: options:
- label: 是否仔细阅读过 [文档](https://yiming_chang.gitee.io/pure-admin-doc/) (Have you read [documentation](https://yiming_chang.gitee.io/pure-admin-doc/) carefully) - label: 是否仔细阅读过 [文档](https://pure-admin.github.io/pure-admin-doc/) (Have you read [documentation](https://pure-admin.github.io/pure-admin-doc/) carefully)
required: true required: true
- label: 检查是否存在相同或类似的问题 [issues](https://github.com/pure-admin/vue-pure-admin/issues) (Check for the same or similar [issues](https://github.com/pure-admin/vue-pure-admin/issues)) - label: 检查是否存在相同或类似的问题 [issues](https://github.com/pure-admin/vue-pure-admin/issues) (Check for the same or similar [issues](https://github.com/pure-admin/vue-pure-admin/issues))
required: true required: true

View File

@@ -13,18 +13,18 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Node.js - name: Install Node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: 18 node-version: 20
- uses: pnpm/action-setup@v2 - uses: pnpm/action-setup@v3
name: Install pnpm name: Install pnpm
id: pnpm-install id: pnpm-install
with: with:
version: 8.6.10 version: 9
run_install: false run_install: false
- name: Get pnpm store directory - name: Get pnpm store directory
@@ -33,7 +33,7 @@ jobs:
run: | run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3 - uses: actions/cache@v4
name: Setup pnpm cache name: Setup pnpm cache
with: with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}

42
.github/workflows/pages.yml vendored Normal file
View File

@@ -0,0 +1,42 @@
name: Build and Deploy
permissions:
contents: write
on:
push:
branches:
- pages
jobs:
deploy:
concurrency: ci-${{ github.ref }}
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
registry-url: https://registry.npmjs.com/
- uses: pnpm/action-setup@v3
name: Install pnpm
id: pnpm-install
with:
version: 9
run_install: false
- name: Deploy 🔧
run: |
pnpm install --no-frozen-lockfile
sed -i "s#VITE_PUBLIC_PATH = /#VITE_PUBLIC_PATH = /vue-pure-admin/#g" $(pwd)/.env.production
pnpm build
cd dist
touch README.md .nojekyll
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: dist
clean: true

View File

@@ -3,7 +3,7 @@
"prettier --cache --ignore-unknown --write", "prettier --cache --ignore-unknown --write",
"eslint --cache --fix" "eslint --cache --fix"
], ],
"{!(package)*.json,*.code-snippets,.!({browserslist,nvm})*rc}": [ "{!(package)*.json,*.code-snippets,.!({browserslist,npm,nvm})*rc}": [
"prettier --cache --write--parser json" "prettier --cache --write--parser json"
], ],
"package.json": ["prettier --cache --write"], "package.json": ["prettier --cache --write"],

5
.npmrc
View File

@@ -1,3 +1,4 @@
shell-emulator=true
shamefully-hoist=true shamefully-hoist=true
strict-peer-dependencies=false enable-pre-post-scripts=false
shell-emulator=true strict-peer-dependencies=false

2
.nvmrc
View File

@@ -1 +1 @@
v20.11.1 v20.15.0

View File

@@ -1,6 +1,7 @@
{ {
"recommendations": [ "recommendations": [
"christian-kohler.path-intellisense", "christian-kohler.path-intellisense",
"warmthsea.vscode-custom-code-color",
"vscode-icons-team.vscode-icons", "vscode-icons-team.vscode-icons",
"davidanson.vscode-markdownlint", "davidanson.vscode-markdownlint",
"ms-azuretools.vscode-docker", "ms-azuretools.vscode-docker",

27
.vscode/settings.json vendored
View File

@@ -31,11 +31,18 @@
"i18n-ally.keystyle": "nested", "i18n-ally.keystyle": "nested",
"i18n-ally.sortKeys": true, "i18n-ally.sortKeys": true,
"i18n-ally.namespace": true, "i18n-ally.namespace": true,
"i18n-ally.enabledParsers": ["yaml", "js"], "i18n-ally.enabledParsers": [
"yaml",
"js"
],
"i18n-ally.sourceLanguage": "en", "i18n-ally.sourceLanguage": "en",
"i18n-ally.displayLanguage": "zh-CN", "i18n-ally.displayLanguage": "zh-CN",
"i18n-ally.enabledFrameworks": ["vue"], "i18n-ally.enabledFrameworks": [
"iconify.excludes": ["el"], "vue"
],
"iconify.excludes": [
"el"
],
"vsmqtt.brokerProfiles": [ "vsmqtt.brokerProfiles": [
{ {
"name": "broker.emqx.io", "name": "broker.emqx.io",
@@ -43,5 +50,15 @@
"port": 1883, "port": 1883,
"clientId": "vsmqtt_client_db34" "clientId": "vsmqtt_client_db34"
} }
] ],
} "vscodeCustomCodeColor.highlightValue": [
"v-loading",
"v-auth",
"v-copy",
"v-longpress",
"v-optimize",
"v-perms",
"v-ripple"
],
"vscodeCustomCodeColor.highlightValueColor": "#b392f0",
}

View File

@@ -1,6 +1,111 @@
# 5.8.0 (2024-08-19)
### 🎫 Feat
- Added a second button permission command (judged based on the `permissions` field returned by the login interface)
- Functional pop-up box `ReDialog` adds whether to enable the `loading` loading animation function after clicking the confirmation button
- `PureTableBar` component adds full screen and exit full screen functions
- `VxeTableBar` component adds full screen and exit full screen functions
- The OK button of the `ReDialog` component provides the close button animation `closeLoading` function
- Add development environment code debugging `vite-plugin-vue-inspector` plug-in to improve development experience
- Added `vite-plugin-checker` plugin for stricter type and `eslint` verification
### 🐞 Bug fixes
- Fixed the problem that the current tab cannot be closed after configuring the routing attribute `fixedTag` to `false`
- Fixed the issue where `logo` cannot be hidden in top menu mode
### 🍏 Perf
- Optimize type hints for custom instructions
- Optimize the press enter login function on the login page
- Optimize the mask level of the left menu on the mobile side
- Optimize system management-permission function style of role management
- Upgraded dependencies, compatible with the latest version of `element-plus`
# 5.7.0 (2024-06-04)
### 🎫 Feat
- Add Google style tabs
### 🐞 Bug fixes
- Fixed the issue where the text exceeds and is not hidden after the menu is folded in Firefox browser
# 5.6.0 (2024-05-14)
### ✔️ Refactor
- Upgrade `pnpm` to `v9` version, requiring `pnpm` version `>=9`
### 🐞 Bug fixes
- Fixed the issue where clicking on an external link would jump twice
### 🍏 Perf
- Optimize `ReSegmented` component
# 5.5.0 (2024-05-07)
### 📄 Docs
The addresses of the document site and full version preview site have been changed!
- The latest document site address: https://pure-admin.github.io/pure-admin-doc
- The latest full version preview site address: https://pure-admin.github.io/vue-pure-admin
### ✔️ Refactor
- Reconstruct the `layout` file naming convention to make it more readable
### 🎫 Feat
- Add new component `ReVxeTableBar` to be used with `vxe-table`
### 🐞 Bug fixes
- Fixed the issue where the background color is white when `FixedHeader` is set to `false` in dark mode
- Fixed the problem of delayed closing of functional pop-up window `ReDialog` when clicking the cancel button
### 🍏 Perf
- Optimize account settings-avatar upload function
# 5.4.0 (2024-04-18)
### 🎫 Feat
- Add global disabled attribute `disabled` to `ReSegmented` component
- Added mind map examples
- Functional pop-up box `ReDialog` adds `Popconfirm` bubble confirmation box
- `pure-table` adds `headerSlot` custom header slot usage example
- The route adds a configurable `fixedTag` attribute, which determines whether the current menu name is fixedly displayed on the tab and cannot be closed.
- Added account setting function page and compatible with mobile terminals
- Upgrade `eslint9` and related compatibility processing
- Added global configuration `MaxTagsLevel` property to set the maximum number of open tabs
- Full coverage of the internationalization of the core code of the framework (only the internationalization of the business code needs to be processed)
### 🐞 Bug fixes
- Fixed the issue where columns cannot be dragged normally when there are multiple `RePureTableBar` components on a page
- Fixed the problem of icon display style after the third-level menu is folded to the left
- Fixed the issue where the font color does not take effect after refreshing the account settings page
- Fixed the issue where the `refreshToken` parameter is empty when calling the refresh `token` interface
### 🍏 Perf
- Optimize login interface
- Optimize the logic of obtaining the top menu
- Optimize request whitelist logic and be compatible with more scenarios
- Simplified export and import usage in `store` files
- Removed unnecessary `cloc` tool dependency package, which uses the `GPL` open source license and is controversial
- Optimize the types of `post` and `get` utility functions in `src/utils/http` files
# 5.3.0 (2024-03-28) # 5.3.0 (2024-03-28)
### ✔️ refactor ### ✔️ Refactor
- Reconstruct internationalized file naming conventions and demo pages with code location hints - Reconstruct internationalized file naming conventions and demo pages with code location hints
@@ -13,7 +118,7 @@
# 5.2.0 (2024-03-22) # 5.2.0 (2024-03-22)
### ✔️ refactor ### ✔️ Refactor
- Place the full screen button at the top to make it visible and easy to operate - Place the full screen button at the top to make it visible and easy to operate
@@ -49,7 +154,7 @@
# 5.1.0 (2024-03-02) # 5.1.0 (2024-03-02)
### ✔️ refactor ### ✔️ Refactor
- Reconstruct the tab page `UI` to make it more convenient to click the close button - Reconstruct the tab page `UI` to make it more convenient to click the close button
@@ -71,7 +176,7 @@
Totally `ESM` version Totally `ESM` version
### ✔️ refactor ### ✔️ Refactor
- Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10` - Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10`
- Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs) - Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs)
@@ -162,7 +267,7 @@ Totally `ESM` version
# 4.5.0 (2023-06-26) # 4.5.0 (2023-06-26)
### ✔️ refactor ### ✔️ Refactor
- Refactor image crop `ReCropper` component, add more useful functions - Refactor image crop `ReCropper` component, add more useful functions
@@ -275,7 +380,7 @@ Totally `ESM` version
[View 4.0.0 version optimization details](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158) [View 4.0.0 version optimization details](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158)
### ✔️ refactor ### ✔️ Refactor
- Use `css` pseudo-class `before` to refactor the activation background of the menu, similar to [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed) - Use `css` pseudo-class `before` to refactor the activation background of the menu, similar to [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed)
@@ -346,10 +451,10 @@ Totally `ESM` version
# 3.9.5 (2022-12-13) # 3.9.5 (2022-12-13)
### ✔️ refactor ### ✔️ Refactor
- completely removed `lodash` and its related libraries - completely removed `lodash` and its related libraries
[Click here to see Why Removed? How to integrate it yourself? ](https://yiming_chang.gitee.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7 %89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C% E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9 %99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) [Click here to see Why Removed? How to integrate it yourself? ](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7 %89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C% E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9 %99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90)
### 🎫 Feat ### 🎫 Feat
@@ -366,10 +471,10 @@ Totally `ESM` version
# 3.9.4 (2022-12-05) # 3.9.4 (2022-12-05)
### ✔️ refactor ### ✔️ Refactor
- Completely removed `vxe-table`, after removal, the overall package size of the full version is reduced by `1.82MB`, and the initial startup time is basically the same as the lite version 🐮 - Completely removed `vxe-table`, after removal, the overall package size of the full version is reduced by `1.82MB`, and the initial startup time is basically the same as the lite version 🐮
[Click here to see Why Removed? How to integrate it yourself?](https://yiming_chang.gitee.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) [Click here to see Why Removed? How to integrate it yourself?](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90)
### 🎫 Feat ### 🎫 Feat
@@ -475,13 +580,13 @@ Totally `ESM` version
# 3.7.0 (2022-11-21) # 3.7.0 (2022-11-21)
### ✔️ refactor ### ✔️ Refactor
- Replace `driver.js` with `intro.js` - Replace `driver.js` with `intro.js`
### 🎫 Feat ### 🎫 Feat
- Add front-end single sign-on, test address https://yiming_chang.gitee.io/vue-pure-admin/#/pure-table/index?username=sso&roles=admin&accessToken=eyJhbGciOiJIUzUxMiJ9.admin - Add front-end single sign-on, test address https://pure-admin.github.io/vue-pure-admin/#/pure-table/index?username=sso&roles=admin&accessToken=eyJhbGciOiJIUzUxMiJ9.admin
- Add more examples for [@pureadmin/table](https://github.com/pure-admin/pure-admin-table) and `element-plus` [table](https://element-plus.org /zh-CN/component/table.html) example remains the same - Add more examples for [@pureadmin/table](https://github.com/pure-admin/pure-admin-table) and `element-plus` [table](https://element-plus.org /zh-CN/component/table.html) example remains the same
- Rich watermark function page (supports customizing various colors, shadows, text, additional attributes, setting undeletable watermarks and setting watermarks for specified elements) - Rich watermark function page (supports customizing various colors, shadows, text, additional attributes, setting undeletable watermarks and setting watermarks for specified elements)
- Optimize the menu, add `MenuArrowIconNoTransition` global configuration, configure it in `public/platform-config.json`, for the left menu mode, the menu expansion can be set `MenuArrowIconNoTransition: true` to solve - Optimize the menu, add `MenuArrowIconNoTransition` global configuration, configure it in `public/platform-config.json`, for the left menu mode, the menu expansion can be set `MenuArrowIconNoTransition: true` to solve
@@ -526,7 +631,7 @@ Totally `ESM` version
# 3.6.2 (2022-10-27) # 3.6.2 (2022-10-27)
### ✔️ refactor ### ✔️ Refactor
- Replace `/@/` alias with `@/` alias - Replace `/@/` alias with `@/` alias
@@ -554,7 +659,7 @@ Totally `ESM` version
- Add typewriter component `demo` - Add typewriter component `demo`
- Added `json` editor `demo` - Added `json` editor `demo`
### ✔️ refactor ### ✔️ Refactor
- Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode) - Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode)
@@ -580,9 +685,9 @@ Totally `ESM` version
- Add `element-plus` seamless scrolling `Table` page demo - Add `element-plus` seamless scrolling `Table` page demo
- Open `vscode` bracket pair guide - Open `vscode` bracket pair guide
### ✔️ refactor ### ✔️ Refactor
- Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://yiming_chang.gitee.io/pure-admin-doc/pages/tailwindcss/) - Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://pure-admin.github.io/pure-admin-doc/pages/tailwindcss/)
### 🐞 Bug fixes ### 🐞 Bug fixes
@@ -630,7 +735,7 @@ Totally `ESM` version
- Added export `excel` page demo - Added export `excel` page demo
- Added blank page demo without `Layout` - Added blank page demo without `Layout`
### ✔️ refactor ### ✔️ Refactor
- Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging) - Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging)
- Refactored route reset function - Refactored route reset function
@@ -666,7 +771,7 @@ Totally `ESM` version
- Added pre-release packaging mode - Added pre-release packaging mode
- Add [hooks] to close a tag (https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523) - Add [hooks] to close a tag (https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523)
### ✔️ refactor ### ✔️ Refactor
- Refactored the landing page to be more inclined to the actual business scenario - Refactored the landing page to be more inclined to the actual business scenario
- Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss` - Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss`
@@ -745,7 +850,7 @@ Totally `ESM` version
- Added `WindiCSS` support - Added `WindiCSS` support
- Add online environment remove console plugin `vite-plugin-remove-console` - Add online environment remove console plugin `vite-plugin-remove-console`
### ✔️ refactor ### ✔️ Refactor
- Replace `@element-plus/icons-vue` with `@iconify-icons/ep` - Replace `@element-plus/icons-vue` with `@iconify-icons/ep`

View File

@@ -1,6 +1,111 @@
# 5.8.0 (2024-08-19)
### 🎫 Feat
- Added a second button permission command (judged based on the `permissions` field returned by the login interface)
- Functional pop-up box `ReDialog` adds whether to enable the `loading` loading animation function after clicking the confirmation button
- `PureTableBar` component adds full screen and exit full screen functions
- `VxeTableBar` component adds full screen and exit full screen functions
- The OK button of the `ReDialog` component provides the close button animation `closeLoading` function
- Add development environment code debugging `vite-plugin-vue-inspector` plug-in to improve development experience
- Added `vite-plugin-checker` plugin for stricter type and `eslint` verification
### 🐞 Bug fixes
- Fixed the problem that the current tab cannot be closed after configuring the routing attribute `fixedTag` to `false`
- Fixed the issue where `logo` cannot be hidden in top menu mode
### 🍏 Perf
- Optimize type hints for custom instructions
- Optimize the press enter login function on the login page
- Optimize the mask level of the left menu on the mobile side
- Optimize system management-permission function style of role management
- Upgraded dependencies, compatible with the latest version of `element-plus`
# 5.7.0 (2024-06-04)
### 🎫 Feat
- Add Google style tabs
### 🐞 Bug fixes
- Fixed the issue where the text exceeds and is not hidden after the menu is folded in Firefox browser
# 5.6.0 (2024-05-14)
### ✔️ Refactor
- Upgrade `pnpm` to `v9` version, requiring `pnpm` version `>=9`
### 🐞 Bug fixes
- Fixed the issue where clicking on an external link would jump twice
### 🍏 Perf
- Optimize `ReSegmented` component
# 5.5.0 (2024-05-07)
### 📄 Docs
The addresses of the document site and full version preview site have been changed!
- The latest document site address: https://pure-admin.github.io/pure-admin-doc
- The latest full version preview site address: https://pure-admin.github.io/vue-pure-admin
### ✔️ Refactor
- Reconstruct the `layout` file naming convention to make it more readable
### 🎫 Feat
- Add new component `ReVxeTableBar` to be used with `vxe-table`
### 🐞 Bug fixes
- Fixed the issue where the background color is white when `FixedHeader` is set to `false` in dark mode
- Fixed the problem of delayed closing of functional pop-up window `ReDialog` when clicking the cancel button
### 🍏 Perf
- Optimize account settings-avatar upload function
# 5.4.0 (2024-04-18)
### 🎫 Feat
- Add global disabled attribute `disabled` to `ReSegmented` component
- Added mind map examples
- Functional pop-up box `ReDialog` adds `Popconfirm` bubble confirmation box
- `pure-table` adds `headerSlot` custom header slot usage example
- The route adds a configurable `fixedTag` attribute, which determines whether the current menu name is fixedly displayed on the tab and cannot be closed.
- Added account setting function page and compatible with mobile terminals
- Upgrade `eslint9` and related compatibility processing
- Added global configuration `MaxTagsLevel` property to set the maximum number of open tabs
- Full coverage of the internationalization of the core code of the framework (only the internationalization of the business code needs to be processed)
### 🐞 Bug fixes
- Fixed the issue where columns cannot be dragged normally when there are multiple `RePureTableBar` components on a page
- Fixed the problem of icon display style after the third-level menu is folded to the left
- Fixed the issue where the font color does not take effect after refreshing the account settings page
- Fixed the issue where the `refreshToken` parameter is empty when calling the refresh `token` interface
### 🍏 Perf
- Optimize login interface
- Optimize the logic of obtaining the top menu
- Optimize request whitelist logic and be compatible with more scenarios
- Simplified export and import usage in `store` files
- Removed unnecessary `cloc` tool dependency package, which uses the `GPL` open source license and is controversial
- Optimize the types of `post` and `get` utility functions in `src/utils/http` files
# 5.3.0 (2024-03-28) # 5.3.0 (2024-03-28)
### ✔️ refactor ### ✔️ Refactor
- Reconstruct internationalized file naming conventions and demo pages with code location hints - Reconstruct internationalized file naming conventions and demo pages with code location hints
@@ -13,7 +118,7 @@
# 5.2.0 (2024-03-22) # 5.2.0 (2024-03-22)
### ✔️ refactor ### ✔️ Refactor
- Place the full screen button at the top to make it visible and easy to operate - Place the full screen button at the top to make it visible and easy to operate
@@ -49,7 +154,7 @@
# 5.1.0 (2024-03-02) # 5.1.0 (2024-03-02)
### ✔️ refactor ### ✔️ Refactor
- Reconstruct the tab page `UI` to make it more convenient to click the close button - Reconstruct the tab page `UI` to make it more convenient to click the close button
@@ -71,7 +176,7 @@
Totally `ESM` version Totally `ESM` version
### ✔️ refactor ### ✔️ Refactor
- Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10` - Upgrade `vite` to `v5` version, specify `node` version `>18.18.0`, `pnpm` version `>=8.6.10`
- Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs) - Use [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) to replace [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock), use [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) to replace [mockjs](https://www.npmjs.com/package/mockjs)
@@ -162,7 +267,7 @@ Totally `ESM` version
# 4.5.0 (2023-06-26) # 4.5.0 (2023-06-26)
### ✔️ refactor ### ✔️ Refactor
- Refactor image crop `ReCropper` component, add more useful functions - Refactor image crop `ReCropper` component, add more useful functions
@@ -275,7 +380,7 @@ Totally `ESM` version
[View 4.0.0 version optimization details](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158) [View 4.0.0 version optimization details](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158)
### ✔️ refactor ### ✔️ Refactor
- Use `css` pseudo-class `before` to refactor the activation background of the menu, similar to [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed) - Use `css` pseudo-class `before` to refactor the activation background of the menu, similar to [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed)
@@ -346,10 +451,10 @@ Totally `ESM` version
# 3.9.5 (2022-12-13) # 3.9.5 (2022-12-13)
### ✔️ refactor ### ✔️ Refactor
- completely removed `lodash` and its related libraries - completely removed `lodash` and its related libraries
[Click here to see Why Removed? How to integrate it yourself? ](https://yiming_chang.gitee.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7 %89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C% E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9 %99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) [Click here to see Why Removed? How to integrate it yourself? ](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7 %89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C% E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9 %99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90)
### 🎫 Feat ### 🎫 Feat
@@ -366,10 +471,10 @@ Totally `ESM` version
# 3.9.4 (2022-12-05) # 3.9.4 (2022-12-05)
### ✔️ refactor ### ✔️ Refactor
- Completely removed `vxe-table`, after removal, the overall package size of the full version is reduced by `1.82MB`, and the initial startup time is basically the same as the lite version 🐮 - Completely removed `vxe-table`, after removal, the overall package size of the full version is reduced by `1.82MB`, and the initial startup time is basically the same as the lite version 🐮
[Click here to see Why Removed? How to integrate it yourself?](https://yiming_chang.gitee.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) [Click here to see Why Removed? How to integrate it yourself?](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90)
### 🎫 Feat ### 🎫 Feat
@@ -475,13 +580,13 @@ Totally `ESM` version
# 3.7.0 (2022-11-21) # 3.7.0 (2022-11-21)
### ✔️ refactor ### ✔️ Refactor
- Replace `driver.js` with `intro.js` - Replace `driver.js` with `intro.js`
### 🎫 Feat ### 🎫 Feat
- Add front-end single sign-on, test address https://yiming_chang.gitee.io/vue-pure-admin/#/pure-table/index?username=sso&roles=admin&accessToken=eyJhbGciOiJIUzUxMiJ9.admin - Add front-end single sign-on, test address https://pure-admin.github.io/vue-pure-admin/#/pure-table/index?username=sso&roles=admin&accessToken=eyJhbGciOiJIUzUxMiJ9.admin
- Add more examples for [@pureadmin/table](https://github.com/pure-admin/pure-admin-table) and `element-plus` [table](https://element-plus.org /zh-CN/component/table.html) example remains the same - Add more examples for [@pureadmin/table](https://github.com/pure-admin/pure-admin-table) and `element-plus` [table](https://element-plus.org /zh-CN/component/table.html) example remains the same
- Rich watermark function page (supports customizing various colors, shadows, text, additional attributes, setting undeletable watermarks and setting watermarks for specified elements) - Rich watermark function page (supports customizing various colors, shadows, text, additional attributes, setting undeletable watermarks and setting watermarks for specified elements)
- Optimize the menu, add `MenuArrowIconNoTransition` global configuration, configure it in `public/platform-config.json`, for the left menu mode, the menu expansion can be set `MenuArrowIconNoTransition: true` to solve - Optimize the menu, add `MenuArrowIconNoTransition` global configuration, configure it in `public/platform-config.json`, for the left menu mode, the menu expansion can be set `MenuArrowIconNoTransition: true` to solve
@@ -526,7 +631,7 @@ Totally `ESM` version
# 3.6.2 (2022-10-27) # 3.6.2 (2022-10-27)
### ✔️ refactor ### ✔️ Refactor
- Replace `/@/` alias with `@/` alias - Replace `/@/` alias with `@/` alias
@@ -554,7 +659,7 @@ Totally `ESM` version
- Add typewriter component `demo` - Add typewriter component `demo`
- Added `json` editor `demo` - Added `json` editor `demo`
### ✔️ refactor ### ✔️ Refactor
- Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode) - Refactor the permission module, adopt the most commonly used `RBAC` (Role-Based Access List): role-based permission control (User -> Role -> Permission), and update the page permission and button permission `demo` example, button Permissions support three operation modes (judging permissions in component mode, judging permissions in function mode, and judging permissions in instruction mode)
@@ -580,9 +685,9 @@ Totally `ESM` version
- Add `element-plus` seamless scrolling `Table` page demo - Add `element-plus` seamless scrolling `Table` page demo
- Open `vscode` bracket pair guide - Open `vscode` bracket pair guide
### ✔️ refactor ### ✔️ Refactor
- Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://yiming_chang.gitee.io/pure-admin-doc/pages/tailwindcss/) - Replace `unocss` with `tailwindcss`, add `tailwindcss` [documentation](https://pure-admin.github.io/pure-admin-doc/pages/tailwindcss/)
### 🐞 Bug fixes ### 🐞 Bug fixes
@@ -630,7 +735,7 @@ Totally `ESM` version
- Added export `excel` page demo - Added export `excel` page demo
- Added blank page demo without `Layout` - Added blank page demo without `Layout`
### ✔️ refactor ### ✔️ Refactor
- Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging) - Refactored the theme color to adapt to `element-plus` dark mode (also solved the problem that the same element `css` in `3.3.0` and earlier versions was overwritten many times, resulting in poor style debugging)
- Refactored route reset function - Refactored route reset function
@@ -666,7 +771,7 @@ Totally `ESM` version
- Added pre-release packaging mode - Added pre-release packaging mode
- Add [hooks] to close a tag (https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523) - Add [hooks] to close a tag (https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523)
### ✔️ refactor ### ✔️ Refactor
- Refactored the landing page to be more inclined to the actual business scenario - Refactored the landing page to be more inclined to the actual business scenario
- Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss` - Use `unocss` instead of `windicss`, `unocss` has better performance in development environment, no memory leaks, and `api` is compatible with `windicss`
@@ -745,7 +850,7 @@ Totally `ESM` version
- Added `WindiCSS` support - Added `WindiCSS` support
- Add online environment remove console plugin `vite-plugin-remove-console` - Add online environment remove console plugin `vite-plugin-remove-console`
### ✔️ refactor ### ✔️ Refactor
- Replace `@element-plus/icons-vue` with `@iconify-icons/ep` - Replace `@element-plus/icons-vue` with `@iconify-icons/ep`

View File

@@ -1,6 +1,111 @@
# 5.8.0 (2024-08-19)
### 🎫 Feat
- 新增第二种按钮权限指令(根据登录接口返回的`permissions`字段进行判断)
- 函数式弹框`ReDialog`添加点击确认按钮后是否开启`loading`加载动画功能
- `PureTableBar`组件添加全屏和退出全屏功能
- `VxeTableBar`组件添加全屏和退出全屏功能
- `ReDialog`组件的确定按钮提供关闭按钮动画`closeLoading`功能
- 添加开发环境代码调试`vite-plugin-vue-inspector`插件,提升开发体验
- 添加`vite-plugin-checker`插件,更严格的类型和`eslint`校验
### 🐞 Bug fixes
- 修复配置路由属性`fixedTag``false`后当前标签页不可关闭的问题
- 修复顶部菜单模式下`logo`不可隐藏的问题
### 🍏 Perf
- 优化自定义指令的类型提示
- 优化登录页回车登录功能
- 优化移动端左侧菜单遮罩层级
- 优化系统管理-角色管理的权限功能样式
- 升级依赖,`element-plus`最新版兼容处理
# 5.7.0 (2024-06-04)
### 🎫 Feat
- 添加谷歌风格的页签
### 🐞 Bug fixes
- 修复在火狐浏览器中菜单折叠后,文字超出未隐藏的问题
# 5.6.0 (2024-05-14)
### ✔️ Refactor
- 升级`pnpm``v9`版本,规定`pnpm`版本`>=9`
### 🐞 Bug fixes
- 修复点击外链会跳转两次的问题
### 🍏 Perf
- 优化`ReSegmented`组件
# 5.5.0 (2024-05-07)
### 📄 Docs
文档站和完整版预览站地址更换!
- 最新文档站地址https://pure-admin.github.io/pure-admin-doc
- 最新完整版预览站地址https://pure-admin.github.io/vue-pure-admin
### ✔️ Refactor
- 重构`layout`文件命名规范,更易读
### 🎫 Feat
- 添加新组件`ReVxeTableBar`搭配`vxe-table`使用
### 🐞 Bug fixes
- 修复深色模式下设置`FixedHeader``false`时,背景色为白色的问题
- 修复函数式弹窗`ReDialog`点击取消按钮,延时关闭无效问题
### 🍏 Perf
- 优化账号设置-头像上传功能
# 5.4.0 (2024-04-18)
### 🎫 Feat
- 分段控制器组件添加全局禁用属性`disabled`
- 添加思维导图示例
- 函数式弹框`ReDialog`添加`Popconfirm`气泡确认框
- `pure-table`添加`headerSlot`自定义表头插槽用法示例
- 路由添加可配置的`fixedTag`属性,作用为当前菜单名称是否固定显示在标签页且不可关闭
- 添加账户设置功能页面且兼容移动端
- 升级`eslint9`,相关兼容处理
- 添加全局配置`MaxTagsLevel`属性,可设置打开标签页最大数
- 框架核心代码国际化全量覆盖(仅需处理业务代码国际化即可)
### 🐞 Bug fixes
- 修复当一个页面存在多个`RePureTableBar`组件,列无法正常拖动问题
- 修复三级菜单向左折叠后图标显示样式问题
- 修复账户设置页面,刷新后字体颜色未生效的问题
- 修复调用刷新`token`接口时,`refreshToken`参数为空的问题
### 🍏 Perf
- 优化登录接口
- 优化获取顶级菜单逻辑
- 优化请求白名单逻辑,兼容更多场景
- 简化`store`文件中导出和导入用法
- 移除非必要的`cloc`工具依赖包,它使用`GPL`开源许可证具有争议性
- 优化`src/utils/http`文件中`post``get`工具函数的类型
# 5.3.0 (2024-03-28) # 5.3.0 (2024-03-28)
### ✔️ refactor ### ✔️ Refactor
- 重构国际化文件命名规范以及演示页加上代码位置提示 - 重构国际化文件命名规范以及演示页加上代码位置提示
@@ -13,7 +118,7 @@
# 5.2.0 (2024-03-22) # 5.2.0 (2024-03-22)
### ✔️ refactor ### ✔️ Refactor
- 将全屏按钮置于顶部,使其显眼且易于操作 - 将全屏按钮置于顶部,使其显眼且易于操作
@@ -41,7 +146,7 @@
- 修复`windwos`下点击注册页面会出现滚动条问题 - 修复`windwos`下点击注册页面会出现滚动条问题
- 修复`windows`下页面切换,内容区会出现滚动条问题 - 修复`windows`下页面切换,内容区会出现滚动条问题
- 修复`pure-table`带状态表格在深色整体风格下状态样式消失的问题 - 修复`pure-table`带状态表格在深色整体风格下状态样式消失的问题
- 修复项目配置中开启灰色模式和深色整体风格,刷新页面整体风格异常 - 修复系统配置中开启灰色模式和深色整体风格,刷新页面整体风格异常
### 🍏 Perf ### 🍏 Perf
@@ -49,7 +154,7 @@
# 5.1.0 (2024-03-02) # 5.1.0 (2024-03-02)
### ✔️ refactor ### ✔️ Refactor
- 重构标签页`UI`,点击关闭按钮更方便 - 重构标签页`UI`,点击关闭按钮更方便
@@ -71,7 +176,7 @@
全面`ESM`版本 全面`ESM`版本
### ✔️ refactor ### ✔️ Refactor
- 升级`vite``v5`版本,规定`node`版本`>18.18.0``pnpm`版本`>=8.6.10` - 升级`vite``v5`版本,规定`node`版本`>18.18.0``pnpm`版本`>=8.6.10`
- 使用 [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) 替换 [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock),使用 [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) 替换 [mockjs](https://www.npmjs.com/package/mockjs) - 使用 [vite-plugin-fake-server](https://www.npmjs.com/package/vite-plugin-fake-server) 替换 [vite-plugin-mock](https://www.npmjs.com/package/vite-plugin-mock),使用 [@faker-js/faker](https://www.npmjs.com/package/@faker-js/faker) 替换 [mockjs](https://www.npmjs.com/package/mockjs)
@@ -84,7 +189,7 @@
- 所有`search`搜索图标统一替换为`@iconify-icons/ri/search-line`它比较常用将其放入全局离线图标中 - 所有`search`搜索图标统一替换为`@iconify-icons/ri/search-line`它比较常用将其放入全局离线图标中
- 移除`iframe`在暗模式下的滤镜效果 - 移除`iframe`在暗模式下的滤镜效果
- 带来更美观精致的首页 - 带来更美观精致的首页
- 更干净整洁的项目配置右侧弹出面板 - 更干净整洁的系统配置右侧弹出面板
- 重构关于页面,整体更紧致,关键信息更突出 - 重构关于页面,整体更紧致,关键信息更突出
### 🎫 Feat ### 🎫 Feat
@@ -162,7 +267,7 @@
# 4.5.0 (2023-06-26) # 4.5.0 (2023-06-26)
### ✔️ refactor ### ✔️ Refactor
- 重构图片裁剪 `ReCropper` 组件,添加更多实用功能 - 重构图片裁剪 `ReCropper` 组件,添加更多实用功能
@@ -274,7 +379,7 @@
[查看 4.0.0 版本优化细节](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158) [查看 4.0.0 版本优化细节](https://github.com/pure-admin/vue-pure-admin/issues/428#issuecomment-1422191158)
### ✔️ refactor ### ✔️ Refactor
- 采用 `css` 伪类 `before` 写法重构菜单的激活背景,类似于 [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed) - 采用 `css` 伪类 `before` 写法重构菜单的激活背景,类似于 [ant.design-menu](https://ant.design/components/menu-cn#components-menu-demo-inline-collapsed)
@@ -345,10 +450,10 @@
# 3.9.5 (2022-12-13) # 3.9.5 (2022-12-13)
### ✔️ refactor ### ✔️ Refactor
- 完全移除了 `lodash` 和其相关库 - 完全移除了 `lodash` 和其相关库
[点击此处查看为什么移除?如何自行集成?](https://yiming_chang.gitee.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C%E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) [点击此处查看为什么移除?如何自行集成?](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-5-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-lodash-%E5%92%8C%E5%85%B6%E7%9B%B8%E5%85%B3%E5%BA%93-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90)
### 🎫 Feat ### 🎫 Feat
@@ -365,10 +470,10 @@
# 3.9.4 (2022-12-05) # 3.9.4 (2022-12-05)
### ✔️ refactor ### ✔️ Refactor
- 完全移除了 `vxe-table`,移除后,完整版整体打包大小减少 `1.82MB`,首启动时长基本和精简版持平 🐮 - 完全移除了 `vxe-table`,移除后,完整版整体打包大小减少 `1.82MB`,首启动时长基本和精简版持平 🐮
[点击此处查看为什么移除?如何自行集成?](https://yiming_chang.gitee.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90) [点击此处查看为什么移除?如何自行集成?](https://pure-admin.github.io/pure-admin-doc/pages/FAQ/#%E5%B9%B3%E5%8F%B0%E5%9C%A8-v3-9-4-%E7%89%88%E6%9C%AC%E5%AE%8C%E5%85%A8%E7%A7%BB%E9%99%A4%E4%BA%86-vxe-table-%E4%B8%BA%E4%BB%80%E4%B9%88%E7%A7%BB%E9%99%A4-%E5%A6%82%E4%BD%95%E8%87%AA%E8%A1%8C%E9%9B%86%E6%88%90)
### 🎫 Feat ### 🎫 Feat
@@ -474,13 +579,13 @@
# 3.7.0 (2022-11-21) # 3.7.0 (2022-11-21)
### ✔️ refactor ### ✔️ Refactor
- 使用 `intro.js` 替换 `driver.js` - 使用 `intro.js` 替换 `driver.js`
### 🎫 Feat ### 🎫 Feat
- 添加前端单点登录,测试地址 https://yiming_chang.gitee.io/vue-pure-admin/#/pure-table/index?username=sso&roles=admin&accessToken=eyJhbGciOiJIUzUxMiJ9.admin - 添加前端单点登录,测试地址 https://pure-admin.github.io/vue-pure-admin/#/pure-table/index?username=sso&roles=admin&accessToken=eyJhbGciOiJIUzUxMiJ9.admin
- 为 [@pureadmin/table](https://github.com/pure-admin/pure-admin-table) 添加更多的示例和 `element-plus` 的 [table](https://element-plus.org/zh-CN/component/table.html) 示例保持一致 - 为 [@pureadmin/table](https://github.com/pure-admin/pure-admin-table) 添加更多的示例和 `element-plus` 的 [table](https://element-plus.org/zh-CN/component/table.html) 示例保持一致
- 丰富水印功能页面(支持自定义各种颜色、阴影、文字、额外属性、设置不可删除水印以及给指定元素设置水印) - 丰富水印功能页面(支持自定义各种颜色、阴影、文字、额外属性、设置不可删除水印以及给指定元素设置水印)
- 优化菜单,添加 `MenuArrowIconNoTransition` 全局配置,在 `public/platform-config.json` 中配置即可,对于出现左侧菜单模式,菜单展开卡顿的可设置 `MenuArrowIconNoTransition: true` 即可解决 - 优化菜单,添加 `MenuArrowIconNoTransition` 全局配置,在 `public/platform-config.json` 中配置即可,对于出现左侧菜单模式,菜单展开卡顿的可设置 `MenuArrowIconNoTransition: true` 即可解决
@@ -525,7 +630,7 @@
# 3.6.2 (2022-10-27) # 3.6.2 (2022-10-27)
### ✔️ refactor ### ✔️ Refactor
- 使用`@/`别名替换`/@/`别名 - 使用`@/`别名替换`/@/`别名
@@ -553,7 +658,7 @@
- 添加打字机组件`demo` - 添加打字机组件`demo`
- 添加`json`编辑器`demo` - 添加`json`编辑器`demo`
### ✔️ refactor ### ✔️ Refactor
- 重构权限模块,采用目前最常用的`RBAC`Role-Based Access List: 基于角色的权限控制( 用户 -> 角色 -> 权限 ),并更新页面权限和按钮权限`demo`示例,按钮权限支持三种操作模式(组件方式判断权限、函数方式判断权限、指令方式判断权限) - 重构权限模块,采用目前最常用的`RBAC`Role-Based Access List: 基于角色的权限控制( 用户 -> 角色 -> 权限 ),并更新页面权限和按钮权限`demo`示例,按钮权限支持三种操作模式(组件方式判断权限、函数方式判断权限、指令方式判断权限)
@@ -579,9 +684,9 @@
- 添加 `element-plus` 无缝滚动 `Table` 页面 demo - 添加 `element-plus` 无缝滚动 `Table` 页面 demo
- 开启 `vscode` 括号对指南 - 开启 `vscode` 括号对指南
### ✔️ refactor ### ✔️ Refactor
- 使用 `tailwindcss` 替换 `unocss`,新增 `tailwindcss` [使用文档](https://yiming_chang.gitee.io/pure-admin-doc/pages/tailwindcss/) - 使用 `tailwindcss` 替换 `unocss`,新增 `tailwindcss` [使用文档](https://pure-admin.github.io/pure-admin-doc/pages/tailwindcss/)
### 🐞 Bug fixes ### 🐞 Bug fixes
@@ -629,7 +734,7 @@
- 添加导出 `excel` 页面 demo - 添加导出 `excel` 页面 demo
- 添加无 `Layout` 的空白页面 demo - 添加无 `Layout` 的空白页面 demo
### ✔️ refactor ### ✔️ Refactor
- 重构主题色,适配 `element-plus` 暗黑模式(同时也解决了 `3.3.0` 及更低版本中同样的元素 `css` 被多次覆盖,导致样式不好调试的问题) - 重构主题色,适配 `element-plus` 暗黑模式(同时也解决了 `3.3.0` 及更低版本中同样的元素 `css` 被多次覆盖,导致样式不好调试的问题)
- 重构路由重置功能 - 重构路由重置功能
@@ -665,7 +770,7 @@
- 添加预发布打包模式 - 添加预发布打包模式
- 添加关闭某个标签的[hooks](https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523) - 添加关闭某个标签的[hooks](https://github.com/pure-admin/vue-pure-admin/commit/5e8723a031923e79f507e5a17151d3bd88a51523)
### ✔️ refactor ### ✔️ Refactor
- 重构登录页,更偏向实际业务场景 - 重构登录页,更偏向实际业务场景
- 使用`unocss`替换`windicss``unocss`开发环境下性能更好,没有内存泄露,而且`api`使用上兼容`windicss` - 使用`unocss`替换`windicss``unocss`开发环境下性能更好,没有内存泄露,而且`api`使用上兼容`windicss`
@@ -744,7 +849,7 @@
- 添加 `WindiCSS` 支持 - 添加 `WindiCSS` 支持
- 添加线上环境删 console 插件`vite-plugin-remove-console` - 添加线上环境删 console 插件`vite-plugin-remove-console`
### ✔️ refactor ### ✔️ Refactor
- 使用`@iconify-icons/ep`替换`@element-plus/icons-vue` - 使用`@iconify-icons/ep`替换`@element-plus/icons-vue`

View File

@@ -1,8 +1,8 @@
FROM node:18-alpine as build-stage FROM node:20-alpine as build-stage
WORKDIR /app WORKDIR /app
RUN corepack enable RUN corepack enable
RUN corepack prepare pnpm@8.6.10 --activate RUN corepack prepare pnpm@latest --activate
RUN npm config set registry https://registry.npmmirror.com RUN npm config set registry https://registry.npmmirror.com

View File

@@ -10,11 +10,9 @@
`vue-pure-admin` is an open source, free and out-of-the-box middle and backend management system template. Completely adopts `ECMAScript` module (`ESM`) specifications to write and organize code, using the latest `Vue3`, `Vite`, `Element-Plus`, `TypeScript`, `Pinia`, `Tailwindcss` and other mainstream technologies develop `vue-pure-admin` is an open source, free and out-of-the-box middle and backend management system template. Completely adopts `ECMAScript` module (`ESM`) specifications to write and organize code, using the latest `Vue3`, `Vite`, `Element-Plus`, `TypeScript`, `Pinia`, `Tailwindcss` and other mainstream technologies develop
## Sponsors ## R&D philosophy
<a class="logo" href="https://ai-tools.cn/resume/start" target="_blank" rel="sponsored noopener"> Seek innovation in stability and see the future in technology
<img src="./public/sponsors/aitools.svg" alt="aitools">
</a>
## Thin version (offering non-internationalized and internationalized versions) ## Thin version (offering non-internationalized and internationalized versions)
@@ -30,12 +28,20 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
## Nanny-level documents ## Nanny-level documents
[Click me to view vue-pure-admin documentation](https://yiming_chang.gitee.io/pure-admin-doc) [Click me to view vue-pure-admin documentation](https://pure-admin.github.io/pure-admin-doc)
[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)
## Quality service, software outsourcing, sponsorship support ## Quality service, software outsourcing, sponsorship support
[Click me for details](https://yiming_chang.gitee.io/pure-admin-doc/pages/service/) [Click me for details](https://pure-admin.github.io/pure-admin-doc/pages/service/)
## `js` version
[Click me to view js version](https://pure-admin.github.io/pure-admin-doc/pages/js/)
## `max` version
[Click me to view the max version](https://github.com/pure-admin/vue-pure-admin-max)
## Tauri ## Tauri
@@ -47,7 +53,7 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
## Preview ## Preview
[preview station](https://yiming_chang.gitee.io/vue-pure-admin) [preview station](https://pure-admin.github.io/vue-pure-admin)
`PC` `PC`
@@ -176,13 +182,15 @@ Thank you very much for your in-depth understanding of the source code and your
| **Contributor** | **SpecificCode** | | **Contributor** | **SpecificCode** |
| :---------------------------------------------: | :------------------------------------------------------------------------------: | | :---------------------------------------------: | :------------------------------------------------------------------------------: |
| [hb0730](https://github.com/hb0730) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=hb0730) | | [hb0730](https://github.com/hb0730) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=hb0730) |
| [o-cc](https://github.com/o-cc) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=o-cc) | | [o-cc](https://github.com/o-cc) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=o-cc) |
| [yj-liuzepeng](https://github.com/yj-liuzepeng) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=yj-liuzepeng) | | [yj-liuzepeng](https://github.com/yj-liuzepeng) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=yj-liuzepeng) |
| [skyline523](https://github.com/skyline523) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=skyline523) | | [skyline523](https://github.com/skyline523) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=skyline523) |
| [shark-lajiao](https://github.com/shark-lajiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) | | [shark-lajiao](https://github.com/shark-lajiao) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) |
| [WitMiao](https://github.com/WitMiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao) | | [WitMiao](https://github.com/WitMiao) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao) |
| [QFifteen](https://github.com/QFifteen) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen) | | [QFifteen](https://github.com/QFifteen) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen) |
| [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) |
## Git Contribution submission specification ## Git Contribution submission specification

View File

@@ -11,11 +11,9 @@
`vue-pure-admin` 是一款开源免费且开箱即用的中后台管理系统模版。完全采用 `ECMAScript` 模块(`ESM`)规范来编写和组织代码,使用了最新的 `Vue3` `vue-pure-admin` 是一款开源免费且开箱即用的中后台管理系统模版。完全采用 `ECMAScript` 模块(`ESM`)规范来编写和组织代码,使用了最新的 `Vue3`
`Vite``Element-Plus``TypeScript``Pinia``Tailwindcss` 等主流技术开发 `Vite``Element-Plus``TypeScript``Pinia``Tailwindcss` 等主流技术开发
## 赞助商 ## 研发理念
<a class="logo" href="https://ai-tools.cn/resume/start" target="_blank" rel="sponsored noopener"> 稳定中求创新,技术中见未来
<img src="./public/sponsors/aitools.svg" alt="aitools">
</a>
## 精简版本(实际项目开发请用精简版本,提供 `非国际化` 、`国际化` 两个版本选择) ## 精简版本(实际项目开发请用精简版本,提供 `非国际化` 、`国际化` 两个版本选择)
@@ -31,12 +29,20 @@
## 配套保姆级文档 ## 配套保姆级文档
[点我查看 vue-pure-admin 文档](https://yiming_chang.gitee.io/pure-admin-doc) [点我查看 vue-pure-admin 文档](https://pure-admin.github.io/pure-admin-doc)
[点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app) [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
## 优质服务、软件外包、赞助支持 ## 优质服务、软件外包、赞助支持
[点我查看详情](https://yiming_chang.gitee.io/pure-admin-doc/pages/service/) [点我查看详情](https://pure-admin.github.io/pure-admin-doc/pages/service/)
## `js` 版本
[点我查看 js 版本](https://pure-admin.github.io/pure-admin-doc/pages/js/)
## `max` 版本
[点我查看 max 版本](https://github.com/pure-admin/vue-pure-admin-max)
## `Tauri` 版本 ## `Tauri` 版本
@@ -48,7 +54,7 @@
## 预览 ## 预览
[点我查看预览](https://yiming_chang.gitee.io/vue-pure-admin) [点我查看预览](https://pure-admin.github.io/vue-pure-admin)
`PC` `PC`
@@ -184,6 +190,8 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
| [shark-lajiao](https://github.com/shark-lajiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) | | [shark-lajiao](https://github.com/shark-lajiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) |
| [WitMiao](https://github.com/WitMiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao) | | [WitMiao](https://github.com/WitMiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao) |
| [QFifteen](https://github.com/QFifteen) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen) | | [QFifteen](https://github.com/QFifteen) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen) |
| [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) |
## `Git` 贡献提交规范 ## `Git` 贡献提交规范

View File

@@ -7,7 +7,7 @@ import boxen, { type Options as BoxenOptions } from "boxen";
dayjs.extend(duration); dayjs.extend(duration);
const welcomeMessage = gradientString("cyan", "magenta").multiline( const welcomeMessage = gradientString("cyan", "magenta").multiline(
`您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://yiming_chang.gitee.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app` `您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.github.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app`
); );
const boxenOptions: BoxenOptions = { const boxenOptions: BoxenOptions = {

View File

@@ -36,8 +36,6 @@ const include = [
"vue-json-pretty", "vue-json-pretty",
"@logicflow/core", "@logicflow/core",
"@pureadmin/utils", "@pureadmin/utils",
"@vue-office/docx",
"@vue-office/excel",
"@wangeditor/editor", "@wangeditor/editor",
"responsive-storage", "responsive-storage",
"plus-pro-components", "plus-pro-components",

View File

@@ -4,7 +4,9 @@ import { pathResolve } from "./utils";
import { viteBuildInfo } from "./info"; import { viteBuildInfo } from "./info";
import svgLoader from "vite-svg-loader"; import svgLoader from "vite-svg-loader";
import type { PluginOption } from "vite"; import type { PluginOption } from "vite";
import checker from "vite-plugin-checker";
import vueJsx from "@vitejs/plugin-vue-jsx"; import vueJsx from "@vitejs/plugin-vue-jsx";
import Inspector from "vite-plugin-vue-inspector";
import { configCompressPlugin } from "./compress"; import { configCompressPlugin } from "./compress";
import removeNoMatch from "vite-plugin-router-warn"; import removeNoMatch from "vite-plugin-router-warn";
import { visualizer } from "rollup-plugin-visualizer"; import { visualizer } from "rollup-plugin-visualizer";
@@ -24,10 +26,21 @@ export function getPluginsList(
// jsx、tsx语法支持 // jsx、tsx语法支持
vueJsx(), vueJsx(),
VueI18nPlugin({ VueI18nPlugin({
runtimeOnly: true, jitCompilation: false,
compositionOnly: true,
include: [pathResolve("../locales/**")] include: [pathResolve("../locales/**")]
}), }),
checker({
typescript: true,
vueTsc: true,
eslint: {
lintCommand: `eslint ${pathResolve("../{src,mock,build}/**/*.{vue,js,ts,tsx}")}`,
useFlatConfig: true
},
terminal: false,
enableBuild: false
}),
// 按下Command(⌘)+Shift(⇧)然后点击页面元素会自动打开本地IDE并跳转到对应的代码位置
Inspector(),
viteBuildInfo(), viteBuildInfo(),
/** /**
* 开发环境下移除非必要的vue-router动态路由警告No match found for location with path * 开发环境下移除非必要的vue-router动态路由警告No match found for location with path

View File

@@ -48,7 +48,7 @@ const __APP_INFO__ = {
}; };
/** 处理环境变量 */ /** 处理环境变量 */
const warpperEnv = (envConf: Recordable): ViteEnv => { const wrapperEnv = (envConf: Recordable): ViteEnv => {
// 默认值 // 默认值
const ret: ViteEnv = { const ret: ViteEnv = {
VITE_PORT: 8848, VITE_PORT: 8848,
@@ -107,4 +107,4 @@ const getPackageSize = options => {
}); });
}; };
export { root, pathResolve, alias, __APP_INFO__, warpperEnv, getPackageSize }; export { root, pathResolve, alias, __APP_INFO__, wrapperEnv, getPackageSize };

View File

@@ -10,7 +10,14 @@ import pluginTypeScript from "@typescript-eslint/eslint-plugin";
export default defineFlatConfig([ export default defineFlatConfig([
{ {
...js.configs.recommended, ...js.configs.recommended,
ignores: ["src/assets/**", "src/**/iconfont/**"], ignores: [
"**/.*",
"dist/*",
"*.d.ts",
"public/*",
"src/assets/**",
"src/**/iconfont/**"
],
languageOptions: { languageOptions: {
globals: { globals: {
// index.d.ts // index.d.ts

View File

@@ -1,7 +1,8 @@
buttons: buttons:
pureAccountSettings: Account
pureLoginOut: LoginOut pureLoginOut: LoginOut
pureLogin: Login pureLogin: Login
pureSystemSet: Open ProjectConfig pureOpenSystemSet: Open System Configs
pureReload: Reload pureReload: Reload
pureCloseCurrentTab: Close CurrentTab pureCloseCurrentTab: Close CurrentTab
pureCloseLeftTabs: Close LeftTabs pureCloseLeftTabs: Close LeftTabs
@@ -10,6 +11,56 @@ buttons:
pureCloseAllTabs: Close AllTabs pureCloseAllTabs: Close AllTabs
pureContentFullScreen: Content FullScreen pureContentFullScreen: Content FullScreen
pureContentExitFullScreen: Content ExitFullScreen pureContentExitFullScreen: Content ExitFullScreen
pureClickCollapse: Collapse
pureClickExpand: Expand
pureConfirm: Confirm
pureSwitch: Switch
pureClose: Close
pureBackTop: BackTop
pureOpenText: Open
pureCloseText: Close
search:
pureTotal: Total
pureHistory: History
pureCollect: Collect
pureDragSort: Drag Sort
pureEmpty: Empty
purePlaceholder: Search Menu
panel:
pureSystemSet: System Configs
pureCloseSystemSet: Close System Configs
pureClearCacheAndToLogin: Clear cache and return to login page
pureClearCache: Clear Cache
pureOverallStyle: Overall Style
pureOverallStyleLight: Light
pureOverallStyleLightTip: Set sail freshly and light up the comfortable work interface
pureOverallStyleDark: Dark
pureOverallStyleDarkTip: Moonlight Overture, indulge in the tranquility and elegance of the night
pureOverallStyleSystem: Auto
pureOverallStyleSystemTip: Synchronize time, the interface naturally responds to morning and dusk
pureThemeColor: Theme Color
pureLayoutModel: Layout Model
pureVerticalTip: The menu on the left is familiar and friendly
pureHorizontalTip: Top menu, concise overview
pureMixTip: Mixed menu, flexible
pureStretch: Stretch Page
pureStretchFixed: Fixed
pureStretchFixedTip: Compact pages make it easy to find the information you need
pureStretchCustom: Custom
pureStretchCustomTip: Minimum 1280, maximum 1600
pureTagsStyle: Tags Style
pureTagsStyleSmart: Smart
pureTagsStyleSmartTip: Smart tags add fun and brilliance
pureTagsStyleCard: Card
pureTagsStyleCardTip: Card tags for efficient browsing
pureTagsStyleChrome: Chrome
pureTagsStyleChromeTip: Chrome style is classic and elegant
pureInterfaceDisplay: Interface Display
pureGreyModel: Grey Model
pureWeakModel: Weak Model
pureHiddenTags: Hidden Tags
pureHiddenFooter: Hidden Footer
pureMultiTagsCache: MultiTags Cache
menus: menus:
pureHome: Home pureHome: Home
pureLogin: Login pureLogin: Login
@@ -74,6 +125,8 @@ menus:
purePermission: Permission Manage purePermission: Permission Manage
purePermissionPage: Page Permission purePermissionPage: Page Permission
purePermissionButton: Button Permission purePermissionButton: Button Permission
purePermissionButtonRouter: Route return button permission
purePermissionButtonLogin: Login interface return button permission
pureTabs: Tabs Operate pureTabs: Tabs Operate
pureGuide: Guide pureGuide: Guide
pureAble: Able pureAble: Able
@@ -108,7 +161,7 @@ menus:
pureTimeline: Time Line pureTimeline: Time Line
pureLineTree: LineTree pureLineTree: LineTree
pureList: List Page pureList: List Page
pureListCard: Card List Page pureCardList: Card List Page
pureDebounce: Debounce & Throttle pureDebounce: Debounce & Throttle
pureFormDesign: Form Design pureFormDesign: Form Design
pureBarcode: Barcode pureBarcode: Barcode
@@ -117,8 +170,6 @@ menus:
pureSwiper: Swiper Plugin pureSwiper: Swiper Plugin
pureVirtualList: Virtual List pureVirtualList: Virtual List
purePdf: PDF Preview purePdf: PDF Preview
pureWord: Word Preview
pureExcels: Excel Preview
pureExcel: Export Excel pureExcel: Export Excel
pureInfiniteScroll: Table Infinite Scroll pureInfiniteScroll: Table Infinite Scroll
pureSensitive: Sensitive Filter pureSensitive: Sensitive Filter
@@ -130,10 +181,17 @@ menus:
pureTableEdit: Edit Usage pureTableEdit: Edit Usage
pureVxeTable: Virtual Usage pureVxeTable: Virtual Usage
pureBoard: Paint Board pureBoard: Paint Board
pureMindMap: Mind Map
pureMenuOverflow: Menu Overflow Show Tooltip Text pureMenuOverflow: Menu Overflow Show Tooltip Text
pureChildMenuOverflow: Child Menu Overflow Show Tooltip Text pureChildMenuOverflow: Child Menu Overflow Show Tooltip Text
status: status:
pureLoad: Loading... pureLoad: Loading...
pureMessage: Message
pureNotify: Notify
pureTodo: Todo
pureNoMessage: No Message
pureNoNotify: No Notify
pureNoTodo: No Todo
login: login:
pureUsername: Username pureUsername: Username
purePassword: Password purePassword: Password
@@ -158,6 +216,7 @@ login:
pureTip: After scanning the code, click "Confirm" to complete the login pureTip: After scanning the code, click "Confirm" to complete the login
pureDefinite: Definite pureDefinite: Definite
pureLoginSuccess: Login Success pureLoginSuccess: Login Success
pureLoginFail: Login Fail
pureRegisterSuccess: Regist Success pureRegisterSuccess: Regist Success
pureTickPrivacy: Please tick Privacy Policy pureTickPrivacy: Please tick Privacy Policy
pureReadAccept: I have read it carefully and accept pureReadAccept: I have read it carefully and accept
@@ -174,4 +233,4 @@ login:
purePassWordRuleReg: The password format should be any combination of 8-18 digits purePassWordRuleReg: The password format should be any combination of 8-18 digits
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

View File

@@ -1,7 +1,8 @@
buttons: buttons:
pureAccountSettings: 账户设置
pureLoginOut: 退出系统 pureLoginOut: 退出系统
pureLogin: 登录 pureLogin: 登录
pureSystemSet: 打开项目配置 pureOpenSystemSet: 打开系统配置
pureReload: 重新加载 pureReload: 重新加载
pureCloseCurrentTab: 关闭当前标签页 pureCloseCurrentTab: 关闭当前标签页
pureCloseLeftTabs: 关闭左侧标签页 pureCloseLeftTabs: 关闭左侧标签页
@@ -10,6 +11,56 @@ buttons:
pureCloseAllTabs: 关闭全部标签页 pureCloseAllTabs: 关闭全部标签页
pureContentFullScreen: 内容区全屏 pureContentFullScreen: 内容区全屏
pureContentExitFullScreen: 内容区退出全屏 pureContentExitFullScreen: 内容区退出全屏
pureClickCollapse: 点击折叠
pureClickExpand: 点击展开
pureConfirm: 确认
pureSwitch: 切换
pureClose: 关闭
pureBackTop: 回到顶部
pureOpenText:
pureCloseText:
search:
pureTotal:
pureHistory: 搜索历史
pureCollect: 收藏
pureDragSort: (可拖拽排序)
pureEmpty: 暂无搜索结果
purePlaceholder: 搜索菜单(支持拼音搜索)
panel:
pureSystemSet: 系统配置
pureCloseSystemSet: 关闭配置
pureClearCacheAndToLogin: 清空缓存并返回登录页
pureClearCache: 清空缓存
pureOverallStyle: 整体风格
pureOverallStyleLight: 浅色
pureOverallStyleLightTip: 清新启航,点亮舒适的工作界面
pureOverallStyleDark: 深色
pureOverallStyleDarkTip: 月光序曲,沉醉于夜的静谧雅致
pureOverallStyleSystem: 自动
pureOverallStyleSystemTip: 同步时光,界面随晨昏自然呼应
pureThemeColor: 主题色
pureLayoutModel: 导航模式
pureVerticalTip: 左侧菜单,亲切熟悉
pureHorizontalTip: 顶部菜单,简洁概览
pureMixTip: 混合菜单,灵活多变
pureStretch: 页宽
pureStretchFixed: 固定
pureStretchFixedTip: 紧凑页面,轻松找到所需信息
pureStretchCustom: 自定义
pureStretchCustomTip: 最小1280、最大1600
pureTagsStyle: 页签风格
pureTagsStyleSmart: 灵动
pureTagsStyleSmartTip: 灵动标签,添趣生辉
pureTagsStyleCard: 卡片
pureTagsStyleCardTip: 卡片标签,高效浏览
pureTagsStyleChrome: 谷歌
pureTagsStyleChromeTip: 谷歌风格,经典美观
pureInterfaceDisplay: 界面显示
pureGreyModel: 灰色模式
pureWeakModel: 色弱模式
pureHiddenTags: 隐藏标签页
pureHiddenFooter: 隐藏页脚
pureMultiTagsCache: 页签持久化
menus: menus:
pureHome: 首页 pureHome: 首页
pureLogin: 登录 pureLogin: 登录
@@ -70,10 +121,12 @@ menus:
pureMenu1-2-1: 菜单1-2-1 pureMenu1-2-1: 菜单1-2-1
pureMenu1-2-2: 菜单1-2-2 pureMenu1-2-2: 菜单1-2-2
pureMenu1-3: 菜单1-3 pureMenu1-3: 菜单1-3
pureMenu2: 菜单2 pureMenu2: 菜单
purePermission: 权限管理 purePermission: 权限管理
purePermissionPage: 页面权限 purePermissionPage: 页面权限
purePermissionButton: 按钮权限 purePermissionButton: 按钮权限
purePermissionButtonRouter: 路由返回按钮权限
purePermissionButtonLogin: 登录接口返回按钮权限
pureTabs: 标签页操作 pureTabs: 标签页操作
pureGuide: 引导页 pureGuide: 引导页
pureAble: 功能 pureAble: 功能
@@ -108,7 +161,7 @@ menus:
pureTimeline: 时间线 pureTimeline: 时间线
pureLineTree: 树形连接线 pureLineTree: 树形连接线
pureList: 列表页面 pureList: 列表页面
pureListCard: 卡片列表页 pureCardList: 卡片列表页
pureDebounce: 防抖节流 pureDebounce: 防抖节流
pureFormDesign: 表单设计器 pureFormDesign: 表单设计器
pureBarcode: 条形码 pureBarcode: 条形码
@@ -117,8 +170,6 @@ menus:
pureSwiper: Swiper插件 pureSwiper: Swiper插件
pureVirtualList: 虚拟列表 pureVirtualList: 虚拟列表
purePdf: PDF预览 purePdf: PDF预览
pureWord: Word预览
pureExcels: Excel预览
pureExcel: 导出Excel pureExcel: 导出Excel
pureInfiniteScroll: 表格无限滚动 pureInfiniteScroll: 表格无限滚动
pureSensitive: 敏感词过滤 pureSensitive: 敏感词过滤
@@ -130,10 +181,17 @@ menus:
pureTableEdit: 可编辑用法 pureTableEdit: 可编辑用法
pureVxeTable: 虚拟滚动 pureVxeTable: 虚拟滚动
pureBoard: 艺术画板 pureBoard: 艺术画板
pureMindMap: 思维导图
pureMenuOverflow: 目录超出显示 Tooltip 文字提示 pureMenuOverflow: 目录超出显示 Tooltip 文字提示
pureChildMenuOverflow: 菜单超出显示 Tooltip 文字提示 pureChildMenuOverflow: 菜单超出显示 Tooltip 文字提示
status: status:
pureLoad: 加载中... pureLoad: 加载中...
pureMessage: 消息
pureNotify: 通知
pureTodo: 待办
pureNoMessage: 暂无消息
pureNoNotify: 暂无通知
pureNoTodo: 暂无待办
login: login:
pureUsername: 账号 pureUsername: 账号
purePassword: 密码 purePassword: 密码
@@ -158,6 +216,7 @@ login:
pureTip: 扫码后点击"确认",即可完成登录 pureTip: 扫码后点击"确认",即可完成登录
pureDefinite: 确定 pureDefinite: 确定
pureLoginSuccess: 登录成功 pureLoginSuccess: 登录成功
pureLoginFail: 登录失败
pureRegisterSuccess: 注册成功 pureRegisterSuccess: 注册成功
pureTickPrivacy: 请勾选隐私政策 pureTickPrivacy: 请勾选隐私政策
pureReadAccept: 我已仔细阅读并接受 pureReadAccept: 我已仔细阅读并接受

View File

@@ -123,17 +123,34 @@ const permissionRouter = {
} }
}, },
{ {
path: "/permission/button/index", path: "/permission/button",
name: "PermissionButton",
meta: { meta: {
title: "menus.purePermissionButton", title: "menus.purePermissionButton",
roles: ["admin", "common"], roles: ["admin", "common"]
auths: [ },
"permission:btn:add", children: [
"permission:btn:edit", {
"permission:btn:delete" path: "/permission/button/router",
] component: "permission/button/index",
} name: "PermissionButtonRouter",
meta: {
title: "menus.purePermissionButtonRouter",
auths: [
"permission:btn:add",
"permission:btn:edit",
"permission:btn:delete"
]
}
},
{
path: "/permission/button/login",
component: "permission/button/perms",
name: "PermissionButtonLogin",
meta: {
title: "menus.purePermissionButtonLogin"
}
}
]
} }
] ]
}; };
@@ -146,30 +163,6 @@ const frameRouter = {
rank: frame rank: frame
}, },
children: [ children: [
{
path: "/iframe/external",
meta: {
title: "menus.pureExternalDoc"
},
children: [
{
path: "/external",
name: "https://yiming_chang.gitee.io/pure-admin-doc",
meta: {
title: "menus.pureExternalLink",
roles: ["admin", "common"]
}
},
{
path: "/pureUtilsLink",
name: "https://pure-admin-utils.netlify.app/",
meta: {
title: "menus.pureUtilsLink",
roles: ["admin", "common"]
}
}
]
},
{ {
path: "/iframe/embedded", path: "/iframe/embedded",
meta: { meta: {
@@ -257,6 +250,30 @@ const frameRouter = {
} }
} }
] ]
},
{
path: "/iframe/external",
meta: {
title: "menus.pureExternalDoc"
},
children: [
{
path: "/external",
name: "https://pure-admin.github.io/pure-admin-doc",
meta: {
title: "menus.pureExternalLink",
roles: ["admin", "common"]
}
},
{
path: "/pureUtilsLink",
name: "https://pure-admin-utils.netlify.app/",
meta: {
title: "menus.pureUtilsLink",
roles: ["admin", "common"]
}
}
]
} }
] ]
}; };

View File

@@ -10,9 +10,13 @@ export default defineFakeRoute([
return { return {
success: true, success: true,
data: { data: {
avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin", username: "admin",
nickname: "小铭",
// 一个用户可能有多个角色 // 一个用户可能有多个角色
roles: ["admin"], roles: ["admin"],
// 按钮级别权限
permissions: ["*:*:*"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.admin", accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh", refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
expires: "2030/10/30 00:00:00" expires: "2030/10/30 00:00:00"
@@ -22,9 +26,11 @@ export default defineFakeRoute([
return { return {
success: true, success: true,
data: { data: {
avatar: "https://avatars.githubusercontent.com/u/52823142",
username: "common", username: "common",
// 一个用户可能有多个角色 nickname: "小林",
roles: ["common"], roles: ["common"],
permissions: ["permission:btn:add", "permission:btn:edit"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.common", accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh", refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
expires: "2030/10/30 00:00:00" expires: "2030/10/30 00:00:00"

59
mock/mine.ts Normal file
View File

@@ -0,0 +1,59 @@
import { defineFakeRoute } from "vite-plugin-fake-server/client";
import { faker } from "@faker-js/faker/locale/zh_CN";
export default defineFakeRoute([
// 账户设置-个人信息
{
url: "/mine",
method: "get",
response: () => {
return {
success: true,
data: {
avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin",
nickname: "小铭",
email: "pureadmin@163.com",
phone: "15888886789",
description: "一个热爱开源的前端工程师"
}
};
}
},
// 账户设置-个人安全日志
{
url: "/mine-logs",
method: "get",
response: () => {
let list = [
{
id: 1,
ip: faker.internet.ipv4(),
address: "中国河南省信阳市",
system: "macOS",
browser: "Chrome",
summary: "账户登录", // 详情
operatingTime: new Date() // 时间
},
{
id: 2,
ip: faker.internet.ipv4(),
address: "中国广东省深圳市",
system: "Windows",
browser: "Firefox",
summary: "绑定了手机号码",
operatingTime: new Date().setDate(new Date().getDate() - 1)
}
];
return {
success: true,
data: {
list,
total: list.length, // 总条目数
pageSize: 10, // 每页显示条目个数
currentPage: 1 // 当前页数
}
};
}
}
]);

View File

@@ -9,9 +9,9 @@ export default defineFakeRoute([
response: ({ body }) => { response: ({ body }) => {
let list = [ let list = [
{ {
username: "admin",
nickname: "admin",
avatar: "https://avatars.githubusercontent.com/u/44761321", avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin",
nickname: "小铭",
phone: "15888886789", phone: "15888886789",
email: faker.internet.email(), email: faker.internet.email(),
sex: 0, sex: 0,
@@ -27,9 +27,9 @@ export default defineFakeRoute([
createTime: 1605456000000 createTime: 1605456000000
}, },
{ {
username: "common",
nickname: "common",
avatar: "https://avatars.githubusercontent.com/u/52823142", avatar: "https://avatars.githubusercontent.com/u/52823142",
username: "common",
nickname: "小林",
phone: "18288882345", phone: "18288882345",
email: faker.internet.email(), email: faker.internet.email(),
sex: 1, sex: 1,
@@ -397,6 +397,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -420,6 +421,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -428,7 +430,7 @@ export default defineFakeRoute([
id: 102, id: 102,
menuType: 2, menuType: 2,
title: "menus.pureExternalLink", title: "menus.pureExternalLink",
name: "https://yiming_chang.gitee.io/pure-admin-doc", name: "https://pure-admin.github.io/pure-admin-doc",
path: "/external", path: "/external",
component: "", component: "",
rank: null, rank: null,
@@ -443,6 +445,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -466,6 +469,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -489,6 +493,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -512,6 +517,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: true, keepAlive: true,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -535,6 +541,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: true, keepAlive: true,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -558,6 +565,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: true, keepAlive: true,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -581,6 +589,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: true, keepAlive: true,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -604,6 +613,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: true, keepAlive: true,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -627,6 +637,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: true, keepAlive: true,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -651,6 +662,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -674,6 +686,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -683,7 +696,7 @@ export default defineFakeRoute([
menuType: 0, menuType: 0,
title: "menus.purePermissionButton", title: "menus.purePermissionButton",
name: "PermissionButton", name: "PermissionButton",
path: "/permission/button/index", path: "/permission/button",
component: "", component: "",
rank: null, rank: null,
redirect: "", redirect: "",
@@ -697,12 +710,37 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
{ {
parentId: 202, parentId: 202,
id: 203, id: 203,
menuType: 0,
title: "menus.purePermissionButtonRouter",
name: "PermissionButtonRouter",
path: "/permission/button/router",
component: "permission/button/index",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 203,
id: 210,
menuType: 3, menuType: 3,
title: "添加", title: "添加",
name: "", name: "",
@@ -720,12 +758,13 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
{ {
parentId: 202, parentId: 203,
id: 204, id: 211,
menuType: 3, menuType: 3,
title: "修改", title: "修改",
name: "", name: "",
@@ -743,12 +782,13 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
{ {
parentId: 202, parentId: 203,
id: 205, id: 212,
menuType: 3, menuType: 3,
title: "删除", title: "删除",
name: "", name: "",
@@ -766,6 +806,103 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 202,
id: 204,
menuType: 0,
title: "menus.purePermissionButtonLogin",
name: "PermissionButtonLogin",
path: "/permission/button/login",
component: "permission/button/perms",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 204,
id: 220,
menuType: 3,
title: "添加",
name: "",
path: "",
component: "",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "permission:btn:add",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 204,
id: 221,
menuType: 3,
title: "修改",
name: "",
path: "",
component: "",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "permission:btn:edit",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true,
showParent: false
},
{
parentId: 204,
id: 222,
menuType: 3,
title: "删除",
name: "",
path: "",
component: "",
rank: null,
redirect: "",
icon: "",
extraIcon: "",
enterTransition: "",
leaveTransition: "",
activePath: "",
auths: "permission:btn:delete",
frameSrc: "",
frameLoading: true,
keepAlive: false,
hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -790,6 +927,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -813,6 +951,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -836,6 +975,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -859,6 +999,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -882,6 +1023,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -906,6 +1048,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -929,6 +1072,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -952,6 +1096,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -975,6 +1120,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -998,6 +1144,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1022,6 +1169,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1045,6 +1193,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1068,6 +1217,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: false, showLink: false,
showParent: false showParent: false
}, },
@@ -1091,6 +1241,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: false, showLink: false,
showParent: false showParent: false
} }
@@ -1472,6 +1623,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1495,6 +1647,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1518,6 +1671,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1541,6 +1695,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
}, },
@@ -1564,6 +1719,7 @@ export default defineFakeRoute([
frameLoading: true, frameLoading: true,
keepAlive: false, keepAlive: false,
hiddenTag: false, hiddenTag: false,
fixedTag: false,
showLink: true, showLink: true,
showParent: false showParent: false
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "vue-pure-admin", "name": "vue-pure-admin",
"version": "5.3.0", "version": "5.8.0",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
@@ -13,7 +13,6 @@
"preview:build": "pnpm build && vite preview", "preview:build": "pnpm build && vite preview",
"typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck", "typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
"svgo": "svgo -f . -r", "svgo": "svgo -f . -r",
"cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
"clean:cache": "rimraf .eslintcache && rimraf pnpm-lock.yaml && rimraf node_modules && pnpm store prune && pnpm install", "clean:cache": "rimraf .eslintcache && rimraf pnpm-lock.yaml && rimraf node_modules && pnpm store prune && pnpm install",
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix", "lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
"lint:prettier": "prettier --write \"src/**/*.{js,ts,json,tsx,css,scss,vue,html,md}\"", "lint:prettier": "prettier --write \"src/**/*.{js,ts,json,tsx,css,scss,vue,html,md}\"",
@@ -50,29 +49,27 @@
"dependencies": { "dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1", "@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.1.3", "@howdyjs/mouse-menu": "^2.1.3",
"@infectoone/vue-ganttastic": "^2.3.1", "@infectoone/vue-ganttastic": "^2.3.2",
"@logicflow/core": "^1.2.23", "@logicflow/core": "^1.2.28",
"@logicflow/extension": "^1.2.23", "@logicflow/extension": "^1.2.28",
"@pureadmin/descriptions": "^1.2.1", "@pureadmin/descriptions": "^1.2.1",
"@pureadmin/table": "^3.1.2", "@pureadmin/table": "^3.2.0",
"@pureadmin/utils": "^2.4.7", "@pureadmin/utils": "^2.4.8",
"@vue-flow/background": "^1.3.0", "@vue-flow/background": "^1.3.0",
"@vue-flow/core": "^1.33.5", "@vue-flow/core": "^1.39.3",
"@vue-office/docx": "^1.6.0", "@vueuse/core": "^10.11.1",
"@vue-office/excel": "^1.7.2", "@vueuse/motion": "^2.2.3",
"@vueuse/core": "^10.9.0",
"@vueuse/motion": "^2.1.0",
"@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.6.8", "axios": "^1.7.3",
"china-area-data": "^5.0.1", "china-area-data": "^5.0.1",
"cropperjs": "^1.6.1", "cropperjs": "^1.6.2",
"dayjs": "^1.11.10", "dayjs": "^1.11.12",
"echarts": "^5.5.0", "echarts": "^5.5.1",
"el-table-infinite-scroll": "^3.0.3", "el-table-infinite-scroll": "^3.0.6",
"element-plus": "^2.6.2", "element-plus": "^2.8.0",
"intro.js": "^7.2.0", "intro.js": "^7.2.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"jsbarcode": "^3.11.6", "jsbarcode": "^3.11.6",
@@ -82,110 +79,121 @@
"mqtt": "4.3.7", "mqtt": "4.3.7",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"path": "^0.12.7", "path": "^0.12.7",
"pinia": "^2.1.7", "pinia": "^2.2.1",
"pinyin-pro": "^3.19.6", "pinyin-pro": "^3.24.2",
"plus-pro-components": "^0.0.5", "plus-pro-components": "^0.1.14",
"qrcode": "^1.5.3", "qrcode": "^1.5.4",
"qs": "^6.12.0", "qs": "^6.13.0",
"responsive-storage": "^2.2.0", "responsive-storage": "^2.2.0",
"sortablejs": "^1.15.2", "sortablejs": "^1.15.2",
"swiper": "^11.0.7", "swiper": "^11.1.9",
"typeit": "^8.8.3", "typeit": "^8.8.4",
"v-contextmenu": "^3.2.0", "v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.1", "v3-infinite-loading": "^1.3.1",
"version-rocket": "^1.7.1", "version-rocket": "^1.7.2",
"vue": "^3.4.21", "vue": "^3.4.37",
"vue-i18n": "^9.10.2", "vue-i18n": "^9.13.1",
"vue-json-pretty": "^2.4.0", "vue-json-pretty": "^2.4.0",
"vue-pdf-embed": "^2.0.3", "vue-pdf-embed": "^2.1.0",
"vue-router": "^4.3.0", "vue-router": "^4.4.3",
"vue-tippy": "^6.4.1", "vue-tippy": "^6.4.4",
"vue-types": "^5.1.1", "vue-types": "^5.1.3",
"vue-virtual-scroller": "2.0.0-beta.8", "vue-virtual-scroller": "2.0.0-beta.8",
"vue-waterfall-plugin-next": "^2.4.3", "vue-waterfall-plugin-next": "^2.4.3",
"vue3-danmaku": "^1.6.0", "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.5.21", "vxe-table": "4.6.17",
"wavesurfer.js": "^7.7.5", "wavesurfer.js": "^7.8.3",
"xgplayer": "^3.0.14", "xgplayer": "^3.0.19",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^19.2.1", "@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.1.0", "@commitlint/config-conventional": "^19.2.2",
"@commitlint/types": "^19.0.3", "@commitlint/types": "^19.0.3",
"@eslint/js": "^8.57.0", "@eslint/js": "^9.9.0",
"@faker-js/faker": "^8.4.1", "@faker-js/faker": "^8.4.1",
"@iconify-icons/ep": "^1.2.12", "@iconify-icons/ep": "^1.2.12",
"@iconify-icons/ri": "^1.2.10", "@iconify-icons/ri": "^1.2.10",
"@iconify/vue": "^4.1.1", "@iconify/vue": "^4.1.2",
"@intlify/unplugin-vue-i18n": "^2.0.0", "@intlify/unplugin-vue-i18n": "^4.0.0",
"@pureadmin/theme": "^3.2.0", "@pureadmin/theme": "^3.2.0",
"@types/dagre": "^0.7.52", "@types/dagre": "^0.7.52",
"@types/gradient-string": "^1.1.5", "@types/gradient-string": "^1.1.6",
"@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.11.30", "@types/node": "^20.14.15",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5", "@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.14", "@types/qs": "^6.9.15",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^7.4.0", "@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.4.0", "@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.0.4", "@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue-jsx": "^3.1.0", "@vitejs/plugin-vue-jsx": "^4.0.0",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.20",
"boxen": "^7.1.1", "boxen": "^7.1.1",
"cloc": "^2.11.0", "cssnano": "^7.0.5",
"cssnano": "^6.1.2",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"eslint": "^8.57.0", "eslint": "^9.9.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0", "eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.1.3", "eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.24.0", "eslint-plugin-vue": "^9.27.0",
"gradient-string": "^2.0.2", "gradient-string": "^2.0.2",
"husky": "^9.0.11", "husky": "^9.1.4",
"lint-staged": "^15.2.2", "lint-staged": "^15.2.8",
"postcss": "^8.4.38", "postcss": "^8.4.41",
"postcss-html": "^1.6.0", "postcss-html": "^1.7.0",
"postcss-import": "^16.1.0", "postcss-import": "^16.1.0",
"postcss-scss": "^4.0.9", "postcss-scss": "^4.0.9",
"prettier": "^3.2.5", "prettier": "^3.3.3",
"rimraf": "^5.0.5", "rimraf": "^5.0.10",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.72.0", "sass": "^1.77.8",
"stylelint": "^16.3.1", "stylelint": "^16.8.1",
"stylelint-config-recess-order": "^5.0.0", "stylelint-config-recess-order": "^5.0.1",
"stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard-scss": "^13.0.0", "stylelint-config-standard-scss": "^13.1.0",
"stylelint-prettier": "^5.0.0", "stylelint-prettier": "^5.0.2",
"svgo": "^3.2.0", "svgo": "^3.3.2",
"tailwindcss": "^3.4.1", "tailwindcss": "^3.4.9",
"typescript": "^5.4.3", "typescript": "^5.5.4",
"vite": "^5.2.6", "vite": "^5.4.0",
"vite-plugin-cdn-import": "^0.3.5", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-checker": "^0.7.2",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-fake-server": "^2.1.1", "vite-plugin-fake-server": "^2.1.1",
"vite-plugin-remove-console": "^2.2.0", "vite-plugin-remove-console": "^2.2.0",
"vite-plugin-router-warn": "^1.0.0", "vite-plugin-router-warn": "^1.0.0",
"vite-plugin-vue-inspector": "^5.1.3",
"vite-svg-loader": "^5.1.0", "vite-svg-loader": "^5.1.0",
"vue-eslint-parser": "^9.4.2", "vue-eslint-parser": "^9.4.3",
"vue-tsc": "^1.8.27" "vue-tsc": "^2.0.29"
}, },
"engines": { "engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0", "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
"pnpm": ">=8.6.10" "pnpm": ">=9"
}, },
"packageManager": "pnpm@8.6.10",
"pnpm": { "pnpm": {
"allowedDeprecatedVersions": { "allowedDeprecatedVersions": {
"are-we-there-yet": "*",
"sourcemap-codec": "*", "sourcemap-codec": "*",
"domexception": "*", "domexception": "*",
"w3c-hr-time": "*", "w3c-hr-time": "*",
"inflight": "*",
"npmlog": "*",
"rimraf": "*",
"stable": "*", "stable": "*",
"abab": "*" "gauge": "*",
"abab": "*",
"glob": "*"
},
"peerDependencyRules": {
"allowedVersions": {
"eslint": "9"
}
} }
} }
} }

14182
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 80 KiB

View File

@@ -10,10 +10,10 @@ import { defineComponent } from "vue";
import { checkVersion } from "version-rocket"; import { checkVersion } from "version-rocket";
import { ElConfigProvider } from "element-plus"; import { ElConfigProvider } from "element-plus";
import { ReDialog } from "@/components/ReDialog"; import { ReDialog } from "@/components/ReDialog";
import en from "element-plus/dist/locale/en.mjs"; import en from "element-plus/es/locale/lang/en";
import zhCn from "element-plus/dist/locale/zh-cn.mjs"; import zhCn from "element-plus/es/locale/lang/zh-cn";
import plusEn from "plus-pro-components/locale/en.mjs"; import plusEn from "plus-pro-components/es/locale/lang/en";
import plusZhCn from "plus-pro-components/locale/zh-cn.mjs"; import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";
export default defineComponent({ export default defineComponent({
name: "app", name: "app",

View File

@@ -3,10 +3,16 @@ import { http } from "@/utils/http";
export type UserResult = { export type UserResult = {
success: boolean; success: boolean;
data: { data: {
/** 头像 */
avatar: string;
/** 用户名 */ /** 用户名 */
username: string; username: string;
/** 当前登陆用户的角色 */ /** 昵称 */
nickname: string;
/** 当前登录用户的角色 */
roles: Array<string>; roles: Array<string>;
/** 按钮级别权限 */
permissions: Array<string>;
/** `token` */ /** `token` */
accessToken: string; accessToken: string;
/** 用于调用刷新`accessToken`的接口时所需的`token` */ /** 用于调用刷新`accessToken`的接口时所需的`token` */
@@ -28,12 +34,56 @@ export type RefreshTokenResult = {
}; };
}; };
export type UserInfo = {
/** 头像 */
avatar: string;
/** 用户名 */
username: string;
/** 昵称 */
nickname: string;
/** 邮箱 */
email: string;
/** 联系电话 */
phone: string;
/** 简介 */
description: string;
};
export type UserInfoResult = {
success: boolean;
data: UserInfo;
};
type ResultTable = {
success: boolean;
data?: {
/** 列表数据 */
list: Array<any>;
/** 总条目数 */
total?: number;
/** 每页显示条目个数 */
pageSize?: number;
/** 当前页数 */
currentPage?: number;
};
};
/** 登录 */ /** 登录 */
export const getLogin = (data?: object) => { export const getLogin = (data?: object) => {
return http.request<UserResult>("post", "/login", { data }); return http.request<UserResult>("post", "/login", { data });
}; };
/** 刷新token */ /** 刷新`token` */
export const refreshTokenApi = (data?: object) => { export const refreshTokenApi = (data?: object) => {
return http.request<RefreshTokenResult>("post", "/refresh-token", { data }); return http.request<RefreshTokenResult>("post", "/refresh-token", { data });
}; };
/** 账户设置-个人信息 */
export const getMine = (data?: object) => {
return http.request<UserInfoResult>("get", "/mine", { data });
};
/** 账户设置-个人安全日志 */
export const getMineLogs = (data?: object) => {
return http.request<ResultTable>("get", "/mine-logs", { data });
};

View File

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 439 B

View File

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

View File

Before

Width:  |  Height:  |  Size: 161 B

After

Width:  |  Height:  |  Size: 161 B

View File

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 235 B

View File

Before

Width:  |  Height:  |  Size: 840 B

After

Width:  |  Height:  |  Size: 840 B

View File

@@ -7,7 +7,7 @@ defineOptions({
name: "ReAnimateSelector" name: "ReAnimateSelector"
}); });
const props = defineProps({ defineProps({
placeholder: { placeholder: {
type: String, type: String,
default: "请选择动画" default: "请选择动画"
@@ -81,7 +81,7 @@ function onMouseleave() {
<el-select <el-select
clearable clearable
filterable filterable
:placeholder="props.placeholder" :placeholder="placeholder"
popper-class="pure-animate-popper" popper-class="pure-animate-popper"
:model-value="inputValue" :model-value="inputValue"
:filter-method="filterMethod" :filter-method="filterMethod"

View File

@@ -61,7 +61,7 @@ export default defineComponent({
state.rAF = requestAnimationFrame(count); state.rAF = requestAnimationFrame(count);
} }
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
function pauseResume() { function pauseResume() {
if (state.paused) { if (state.paused) {
resume(); resume();
@@ -83,7 +83,7 @@ export default defineComponent({
requestAnimationFrame(count); requestAnimationFrame(count);
} }
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
function reset() { function reset() {
state.startTime = null; state.startTime = null;
cancelAnimationFrame(state.rAF); cancelAnimationFrame(state.rAF);

View File

@@ -0,0 +1,7 @@
import reCropperPreview from "./src/index.vue";
import { withInstall } from "@pureadmin/utils";
/** 图片裁剪预览组件 */
export const ReCropperPreview = withInstall(reCropperPreview);
export default ReCropperPreview;

View File

@@ -3,7 +3,11 @@ import { ref } from "vue";
import ReCropper from "@/components/ReCropper"; import ReCropper from "@/components/ReCropper";
import { formatBytes } from "@pureadmin/utils"; import { formatBytes } from "@pureadmin/utils";
const props = defineProps({ defineOptions({
name: "ReCropperPreview"
});
defineProps({
imgSrc: String imgSrc: String
}); });
@@ -40,7 +44,7 @@ defineExpose({ hidePopover });
<div class="w-[18vw]"> <div class="w-[18vw]">
<ReCropper <ReCropper
ref="refCropper" ref="refCropper"
:src="props.imgSrc" :src="imgSrc"
circled circled
@cropper="onCropper" @cropper="onCropper"
@readied="showPopover = true" @readied="showPopover = true"

View File

@@ -29,9 +29,11 @@ const addDialog = (options: DialogOptions) => {
const closeDialog = (options: DialogOptions, index: number, args?: any) => { const closeDialog = (options: DialogOptions, index: number, args?: any) => {
dialogStore.value[index].visible = false; dialogStore.value[index].visible = false;
options.closeCallBack && options.closeCallBack({ options, index, args }); options.closeCallBack && options.closeCallBack({ options, index, args });
const closeDelay = options?.closeDelay ?? 200;
useTimeoutFn(() => { useTimeoutFn(() => {
dialogStore.value.splice(index, 1); dialogStore.value.splice(index, 1);
}, 200); }, closeDelay);
}; };
/** /**

View File

@@ -11,6 +11,11 @@ import { isFunction } from "@pureadmin/utils";
import Fullscreen from "@iconify-icons/ri/fullscreen-fill"; import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill"; import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
defineOptions({
name: "ReDialog"
});
const sureBtnMap = ref({});
const fullscreen = ref(false); const fullscreen = ref(false);
const footerButtons = computed(() => { const footerButtons = computed(() => {
@@ -37,11 +42,28 @@ const footerButtons = computed(() => {
type: "primary", type: "primary",
text: true, text: true,
bg: true, bg: true,
popconfirm: options?.popconfirm,
btnClick: ({ dialog: { options, index } }) => { btnClick: ({ dialog: { options, index } }) => {
const done = () => if (options?.sureBtnLoading) {
sureBtnMap.value[index] = Object.assign(
{},
sureBtnMap.value[index],
{
loading: true
}
);
}
const closeLoading = () => {
if (options?.sureBtnLoading) {
sureBtnMap.value[index].loading = false;
}
};
const done = () => {
closeLoading();
closeDialog(options, index, { command: "sure" }); closeDialog(options, index, { command: "sure" });
};
if (options?.beforeSure && isFunction(options?.beforeSure)) { if (options?.beforeSure && isFunction(options?.beforeSure)) {
options.beforeSure(done, { options, index }); options.beforeSure(done, { options, index, closeLoading });
} else { } else {
done(); done();
} }
@@ -149,19 +171,35 @@ function handleClose(
<component :is="options?.footerRenderer({ options, index })" /> <component :is="options?.footerRenderer({ options, index })" />
</template> </template>
<span v-else> <span v-else>
<el-button <template v-for="(btn, key) in footerButtons(options)" :key="key">
v-for="(btn, key) in footerButtons(options)" <el-popconfirm
:key="key" v-if="btn.popconfirm"
v-bind="btn" v-bind="btn.popconfirm"
@click=" @confirm="
btn.btnClick({ btn.btnClick({
dialog: { options, index }, dialog: { options, index },
button: { btn, index: key } button: { btn, index: key }
}) })
" "
> >
{{ btn?.label }} <template #reference>
</el-button> <el-button v-bind="btn">{{ btn?.label }}</el-button>
</template>
</el-popconfirm>
<el-button
v-else
v-bind="btn"
:loading="key === 1 && sureBtnMap[index]?.loading"
@click="
btn.btnClick({
dialog: { options, index },
button: { btn, index: key }
})
"
>
{{ btn?.label }}
</el-button>
</template>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>

View File

@@ -11,6 +11,13 @@ type ArgsType = {
/** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了esc键 */ /** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了esc键 */
command: "cancel" | "sure" | "close"; command: "cancel" | "sure" | "close";
}; };
type ButtonType =
| "primary"
| "success"
| "warning"
| "danger"
| "info"
| "text";
/** https://element-plus.org/zh-CN/component/dialog.html#attributes */ /** https://element-plus.org/zh-CN/component/dialog.html#attributes */
type DialogProps = { type DialogProps = {
@@ -58,6 +65,34 @@ type DialogProps = {
destroyOnClose?: boolean; destroyOnClose?: boolean;
}; };
//element-plus.org/zh-CN/component/popconfirm.html#attributes
type Popconfirm = {
/** 标题 */
title?: string;
/** 确定按钮文字 */
confirmButtonText?: string;
/** 取消按钮文字 */
cancelButtonText?: string;
/** 确定按钮类型,默认 `primary` */
confirmButtonType?: ButtonType;
/** 取消按钮类型,默认 `text` */
cancelButtonType?: ButtonType;
/** 自定义图标,默认 `QuestionFilled` */
icon?: string | Component;
/** `Icon` 颜色,默认 `#f90` */
iconColor?: string;
/** 是否隐藏 `Icon`,默认 `false` */
hideIcon?: boolean;
/** 关闭时的延迟,默认 `200` */
hideAfter?: number;
/** 是否将 `popover` 的下拉列表插入至 `body` 元素,默认 `true` */
teleported?: boolean;
/** 当 `popover` 组件长时间不触发且 `persistent` 属性设置为 `false` 时, `popover` 将会被删除,默认 `false` */
persistent?: boolean;
/** 弹层宽度,最小宽度 `150px`,默认 `150` */
width?: string | number;
};
type BtnClickDialog = { type BtnClickDialog = {
options?: DialogOptions; options?: DialogOptions;
index?: number; index?: number;
@@ -86,6 +121,8 @@ type ButtonProps = {
round?: boolean; round?: boolean;
/** 是否为圆形按钮,默认 `false` */ /** 是否为圆形按钮,默认 `false` */
circle?: boolean; circle?: boolean;
/** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
popconfirm?: Popconfirm;
/** 是否为加载中状态,默认 `false` */ /** 是否为加载中状态,默认 `false` */
loading?: boolean; loading?: boolean;
/** 自定义加载中状态图标组件 */ /** 自定义加载中状态图标组件 */
@@ -123,6 +160,10 @@ interface DialogOptions extends DialogProps {
props?: any; props?: any;
/** 是否隐藏 `Dialog` 按钮操作区的内容 */ /** 是否隐藏 `Dialog` 按钮操作区的内容 */
hideFooter?: boolean; hideFooter?: boolean;
/** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
popconfirm?: Popconfirm;
/** 点击确定按钮后是否开启 `loading` 加载动画 */
sureBtnLoading?: boolean;
/** /**
* @description 自定义对话框标题的内容渲染器 * @description 自定义对话框标题的内容渲染器
* @see {@link https://element-plus.org/zh-CN/component/dialog.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%A4%B4%E9%83%A8} * @see {@link https://element-plus.org/zh-CN/component/dialog.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%A4%B4%E9%83%A8}
@@ -220,10 +261,13 @@ interface DialogOptions extends DialogProps {
done: Function, done: Function,
{ {
options, options,
index index,
closeLoading
}: { }: {
options: DialogOptions; options: DialogOptions;
index: number; index: number;
/** 关闭确定按钮的 `loading` 加载动画 */
closeLoading: Function;
} }
) => void; ) => void;
} }

View File

@@ -2,6 +2,10 @@
import flippers from "./filpper"; import flippers from "./filpper";
import { ref, unref, nextTick, onUnmounted } from "vue"; import { ref, unref, nextTick, onUnmounted } from "vue";
defineOptions({
name: "ReFlop"
});
const timer = ref(null); const timer = ref(null);
const flipObjs = ref([]); const flipObjs = ref([]);

View File

@@ -2,7 +2,7 @@
import VueJsonPretty from "vue-json-pretty"; import VueJsonPretty from "vue-json-pretty";
import "vue-json-pretty/lib/styles.css"; import "vue-json-pretty/lib/styles.css";
const props = defineProps({ defineProps({
graphData: Object graphData: Object
}); });
</script> </script>
@@ -12,6 +12,6 @@ const props = defineProps({
:path="'res'" :path="'res'"
:deep="3" :deep="3"
:showLength="true" :showLength="true"
:data="props.graphData" :data="graphData"
/> />
</template> </template>

View File

@@ -35,7 +35,7 @@ const nodeDragNode = item => {
<!-- 左侧bpmn元素选择器 --> <!-- 左侧bpmn元素选择器 -->
<div class="node-panel"> <div class="node-panel">
<div <div
v-for="item in props.nodeList" v-for="item in nodeList"
:key="item.text" :key="item.text"
class="node-item dark:text-bg_color" class="node-item dark:text-bg_color"
@mousedown="nodeDragNode(item)" @mousedown="nodeDragNode(item)"

View File

@@ -194,7 +194,7 @@ watch(
:pager-count="5" :pager-count="5"
layout="pager" layout="pager"
background background
small size="small"
@current-change="onCurrentChange" @current-change="onCurrentChange"
/> />
<el-button <el-button

View File

@@ -4,7 +4,7 @@ import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";
/** /**
* 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标 * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
* @see 点击查看文档图标篇 {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/} * @see 点击查看文档图标篇 {@link https://pure-admin.github.io/pure-admin-doc/pages/icon/}
* @param icon 必传 图标 * @param icon 必传 图标
* @param attrs 可选 iconType 属性 * @param attrs 可选 iconType 属性
* @returns Component * @returns Component

View File

@@ -31,6 +31,7 @@ import Links from "@iconify-icons/ri/links-fill";
import Search from "@iconify-icons/ri/search-line"; import Search from "@iconify-icons/ri/search-line";
import FlUser from "@iconify-icons/ri/admin-line"; import FlUser from "@iconify-icons/ri/admin-line";
import Setting from "@iconify-icons/ri/settings-3-line"; import Setting from "@iconify-icons/ri/settings-3-line";
import MindMap from "@iconify-icons/ri/mind-map";
import BarChart from "@iconify-icons/ri/bar-chart-horizontal-line"; import BarChart from "@iconify-icons/ri/bar-chart-horizontal-line";
import LoginLog from "@iconify-icons/ri/window-line"; import LoginLog from "@iconify-icons/ri/window-line";
import Artboard from "@iconify-icons/ri/artboard-line"; import Artboard from "@iconify-icons/ri/artboard-line";
@@ -54,6 +55,7 @@ addIcon("ri:table-line", Table);
addIcon("ri:search-line", Search); addIcon("ri:search-line", Search);
addIcon("ri:admin-line", FlUser); addIcon("ri:admin-line", FlUser);
addIcon("ri:settings-3-line", Setting); addIcon("ri:settings-3-line", Setting);
addIcon("ri:mind-map", MindMap);
addIcon("ri:bar-chart-horizontal-line", BarChart); addIcon("ri:bar-chart-horizontal-line", BarChart);
addIcon("ri:window-line", LoginLog); addIcon("ri:window-line", LoginLog);
addIcon("ri:file-search-line", SystemLog); addIcon("ri:file-search-line", SystemLog);

View File

@@ -0,0 +1,5 @@
import perms from "./src/perms";
const Perms = perms;
export { Perms };

View File

@@ -0,0 +1,20 @@
import { defineComponent, Fragment } from "vue";
import { hasPerms } from "@/utils/auth";
export default defineComponent({
name: "Perms",
props: {
value: {
type: undefined,
default: []
}
},
setup(props, { slots }) {
return () => {
if (!slots) return null;
return hasPerms(props.value) ? (
<Fragment>{slots.default?.()}</Fragment>
) : null;
};
}
});

View File

@@ -1,7 +1,15 @@
import Sortable from "sortablejs"; import Sortable from "sortablejs";
import { transformI18n } from "@/plugins/i18n"; import { transformI18n } from "@/plugins/i18n";
import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { defineComponent, ref, computed, type PropType, nextTick } from "vue"; import {
type PropType,
ref,
unref,
computed,
nextTick,
defineComponent,
getCurrentInstance
} from "vue";
import { import {
delay, delay,
cloneDeep, cloneDeep,
@@ -10,11 +18,13 @@ import {
getKeyList getKeyList
} from "@pureadmin/utils"; } from "@pureadmin/utils";
import DragIcon from "./svg/drag.svg?component"; import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
import ExpandIcon from "./svg/expand.svg?component"; import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
import RefreshIcon from "./svg/refresh.svg?component"; import DragIcon from "@/assets/table-bar/drag.svg?component";
import SettingIcon from "./svg/settings.svg?component"; import ExpandIcon from "@/assets/table-bar/expand.svg?component";
import CollapseIcon from "./svg/collapse.svg?component"; import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
import SettingIcon from "@/assets/table-bar/settings.svg?component";
import CollapseIcon from "@/assets/table-bar/collapse.svg?component";
const props = { const props = {
/** 头部最左边的标题 */ /** 头部最左边的标题 */
@@ -34,6 +44,10 @@ const props = {
isExpandAll: { isExpandAll: {
type: Boolean, type: Boolean,
default: true default: true
},
tableKey: {
type: [String, Number] as PropType<string | number>,
default: "0"
} }
}; };
@@ -45,7 +59,9 @@ export default defineComponent({
const size = ref("default"); const size = ref("default");
const loading = ref(false); const loading = ref(false);
const checkAll = ref(true); const checkAll = ref(true);
const isFullscreen = ref(false);
const isIndeterminate = ref(false); const isIndeterminate = ref(false);
const instance = getCurrentInstance()!;
const isExpandAll = ref(props.isExpandAll); const isExpandAll = ref(props.isExpandAll);
const filterColumns = cloneDeep(props?.columns).filter(column => const filterColumns = cloneDeep(props?.columns).filter(column =>
isBoolean(column?.hide) isBoolean(column?.hide)
@@ -170,9 +186,9 @@ export default defineComponent({
const rowDrop = (event: { preventDefault: () => void }) => { const rowDrop = (event: { preventDefault: () => void }) => {
event.preventDefault(); event.preventDefault();
nextTick(() => { nextTick(() => {
const wrapper: HTMLElement = document.querySelector( const wrapper: HTMLElement = (
".el-checkbox-group>div" instance?.proxy?.$refs[`GroupRef${unref(props.tableKey)}`] as any
); ).$el.firstElementChild;
Sortable.create(wrapper, { Sortable.create(wrapper, {
animation: 300, animation: 300,
handle: ".drag-btn", handle: ".drag-btn",
@@ -231,7 +247,18 @@ export default defineComponent({
return () => ( return () => (
<> <>
<div {...attrs} class="w-[99/100] mt-2 px-2 pb-2 bg-bg_color"> <div
{...attrs}
class={[
"w-[99/100]",
"px-2",
"pb-2",
"bg-bg_color",
isFullscreen.value
? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
: "mt-2"
]}
>
<div class="flex justify-between w-full h-[60px] p-4"> <div class="flex justify-between w-full h-[60px] p-4">
{slots?.title ? ( {slots?.title ? (
slots.title() slots.title()
@@ -299,6 +326,7 @@ export default defineComponent({
<div class="pt-[6px] pl-[11px]"> <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)}`}
modelValue={checkedColumns.value} modelValue={checkedColumns.value}
onChange={value => handleCheckedColumnsChange(value)} onChange={value => handleCheckedColumnsChange(value)}
> >
@@ -344,6 +372,14 @@ export default defineComponent({
</el-scrollbar> </el-scrollbar>
</div> </div>
</el-popover> </el-popover>
<el-divider direction="vertical" />
<iconifyIconOffline
class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
onClick={() => (isFullscreen.value = !isFullscreen.value)}
/>
</div> </div>
</div> </div>
{slots.default({ {slots.default({

View File

@@ -307,7 +307,7 @@ function touchMove(e) {
function touchEnd() { function touchEnd() {
if (!unref(canTouchScroll)) return; if (!unref(canTouchScroll)) return;
// eslint-disable-next-line prefer-const
let timer: any; let timer: any;
const direction = unref(options).direction; const direction = unref(options).direction;
delay.value = 50; delay.value = 50;
@@ -502,7 +502,7 @@ defineExpose({
</script> </script>
<template> <template>
<div :ref="'wrap' + props.classOption['key']"> <div :ref="'wrap' + classOption['key']">
<div <div
v-if="navigation" v-if="navigation"
:style="leftSwitch" :style="leftSwitch"
@@ -520,7 +520,7 @@ defineExpose({
<slot name="right-switch" /> <slot name="right-switch" />
</div> </div>
<div <div
:ref="'realBox' + props.classOption['key']" :ref="'realBox' + classOption['key']"
:style="pos" :style="pos"
@mouseenter="enter" @mouseenter="enter"
@mouseleave="leave" @mouseleave="leave"
@@ -529,7 +529,7 @@ defineExpose({
@touchend="touchEnd" @touchend="touchEnd"
@mousewheel.passive="wheel" @mousewheel.passive="wheel"
> >
<div :ref="'slotList' + props.classOption['key']" :style="float"> <div :ref="'slotList' + classOption['key']" :style="float">
<slot /> <slot />
</div> </div>
<div :style="float" v-html="copyHtml" /> <div :style="float" v-html="copyHtml" />

View File

@@ -60,14 +60,12 @@ export function copyObj() {
copyIsArray, copyIsArray,
clone, clone,
i = 1, i = 1,
// eslint-disable-next-line prefer-rest-params
target = arguments[0] || {}, // 使用||运算符排除隐式强制类型转换为false的数据类型 target = arguments[0] || {}, // 使用||运算符排除隐式强制类型转换为false的数据类型
deep = false, deep = false,
// eslint-disable-next-line prefer-const
len = arguments.length; len = arguments.length;
if (typeof target === "boolean") { if (typeof target === "boolean") {
deep = target; deep = target;
// eslint-disable-next-line prefer-rest-params
target = arguments[1] || {}; target = arguments[1] || {};
i++; i++;
} }
@@ -80,7 +78,7 @@ export function copyObj() {
} }
for (; i < len; i++) { for (; i < len; i++) {
//所以如果源对象中数据类型为Undefined或Null那么就会跳过本次循环接着循环下一个源对象 //所以如果源对象中数据类型为Undefined或Null那么就会跳过本次循环接着循环下一个源对象
// eslint-disable-next-line prefer-rest-params
if ((options = arguments[i]) != null) { if ((options = arguments[i]) != null) {
// 如果遇到源对象的数据类型为Boolean, Number for in循环会被跳过不执行for in循环// src用于判断target对象是否存在name属性 // 如果遇到源对象的数据类型为Boolean, Number for in循环会被跳过不执行for in循环// src用于判断target对象是否存在name属性
for (name in options) { for (name in options) {

View File

@@ -34,9 +34,19 @@ const props = {
type: Boolean, type: Boolean,
default: false default: false
}, },
/** 控件尺寸 */ /** 控件尺寸 */
size: { size: {
type: String as PropType<"small" | "default" | "large"> type: String as PropType<"small" | "default" | "large">
},
/** 是否全局禁用,默认 `false` */
disabled: {
type: Boolean,
default: false
},
/** 当内容发生变化时,设置 `resize` 可使其自适应容器位置 */
resize: {
type: Boolean,
default: false
} }
}; };
@@ -57,7 +67,7 @@ export default defineComponent({
: ref(0); : ref(0);
function handleChange({ option, index }, event: Event) { function handleChange({ option, index }, event: Event) {
if (option.disabled) return; if (props.disabled || option.disabled) return;
event.preventDefault(); event.preventDefault();
isNumber(props.modelValue) isNumber(props.modelValue)
? emit("update:modelValue", index) ? emit("update:modelValue", index)
@@ -67,6 +77,7 @@ export default defineComponent({
} }
function handleMouseenter({ option, index }, event: Event) { function handleMouseenter({ option, index }, event: Event) {
if (props.disabled) return;
event.preventDefault(); event.preventDefault();
curMouseActive.value = index; curMouseActive.value = index;
if (option.disabled || curIndex.value === index) { if (option.disabled || curIndex.value === index) {
@@ -79,6 +90,7 @@ export default defineComponent({
} }
function handleMouseleave(_, event: Event) { function handleMouseleave(_, event: Event) {
if (props.disabled) return;
event.preventDefault(); event.preventDefault();
curMouseActive.value = -1; curMouseActive.value = -1;
} }
@@ -101,7 +113,7 @@ export default defineComponent({
}); });
} }
props.block && handleResizeInit(); (props.block || props.resize) && handleResizeInit();
watch( watch(
() => curIndex.value, () => curIndex.value,
@@ -115,7 +127,9 @@ export default defineComponent({
} }
); );
watch(() => props.size, handleResizeInit); watch(() => props.size, handleResizeInit, {
immediate: true
});
const rendLabel = () => { const rendLabel = () => {
return props.options.map((option, index) => { return props.options.map((option, index) => {
@@ -124,14 +138,16 @@ export default defineComponent({
ref={`labelRef${index}`} ref={`labelRef${index}`}
class={[ class={[
"pure-segmented-item", "pure-segmented-item",
option?.disabled && "pure-segmented-item-disabled" (props.disabled || option?.disabled) &&
"pure-segmented-item-disabled"
]} ]}
style={{ style={{
background: background:
curMouseActive.value === index ? segmentedItembg.value : "", curMouseActive.value === index ? segmentedItembg.value : "",
color: color: props.disabled
!option.disabled && ? null
(curIndex.value === index || curMouseActive.value === index) : !option.disabled &&
(curIndex.value === index || curMouseActive.value === index)
? isDark.value ? isDark.value
? "rgba(255, 255, 255, 0.85)" ? "rgba(255, 255, 255, 0.85)"
: "rgba(0,0,0,.88)" : "rgba(0,0,0,.88)"

View File

@@ -6,7 +6,7 @@ export interface OptionsType {
label?: string | (() => VNode | Component); label?: string | (() => VNode | Component);
/** /**
* @description 图标,采用平台内置的 `useRenderIcon` 函数渲染 * @description 图标,采用平台内置的 `useRenderIcon` 函数渲染
* @see {@link 用法参考 https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks } * @see {@link 用法参考 https://pure-admin.github.io/pure-admin-doc/pages/icon/#%E9%80%9A%E7%94%A8%E5%9B%BE%E6%A0%87-userendericon-hooks }
*/ */
icon?: string | Component; icon?: string | Component;
/** 图标属性、样式配置 */ /** 图标属性、样式配置 */

View File

@@ -44,7 +44,6 @@
(t.style.width = 0), (t.style.width = 0),
(t.style.height = 0), (t.style.height = 0),
(t.style.overflow = "hidden"), (t.style.overflow = "hidden"),
// eslint-disable-next-line no-self-assign
(t = t), (t = t),
(e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t)); (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
}), }),

View File

@@ -2,6 +2,10 @@
import { h, onMounted, ref, useSlots } from "vue"; import { h, onMounted, ref, useSlots } from "vue";
import { type TippyOptions, useTippy } from "vue-tippy"; import { type TippyOptions, useTippy } from "vue-tippy";
defineOptions({
name: "ReText"
});
const props = defineProps({ const props = defineProps({
// 行数 // 行数
lineClamp: { lineClamp: {

View File

@@ -0,0 +1,5 @@
import vxeTableBar from "./src/bar";
import { withInstall } from "@pureadmin/utils";
/** 配合 `vxe-table` 实现快速便捷的表格操作 */
export const VxeTableBar = withInstall(vxeTableBar);

View File

@@ -0,0 +1,384 @@
import Sortable from "sortablejs";
import { transformI18n } from "@/plugins/i18n";
import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { delay, cloneDeep, getKeyList } from "@pureadmin/utils";
import {
type PropType,
ref,
unref,
computed,
nextTick,
defineComponent,
getCurrentInstance
} from "vue";
import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
import DragIcon from "@/assets/table-bar/drag.svg?component";
import ExpandIcon from "@/assets/table-bar/expand.svg?component";
import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
import SettingIcon from "@/assets/table-bar/settings.svg?component";
import CollapseIcon from "@/assets/table-bar/collapse.svg?component";
const props = {
/** 头部最左边的标题 */
title: {
type: String,
default: "列表"
},
vxeTableRef: {
type: Object as PropType<any>
},
/** 需要展示的列 */
columns: {
type: Array as PropType<any>,
default: () => []
},
/** 是否为树列表 */
tree: {
type: Boolean,
default: false
},
isExpandAll: {
type: Boolean,
default: true
},
tableKey: {
type: [String, Number] as PropType<string | number>,
default: "0"
}
};
export default defineComponent({
name: "VxeTableBar",
props,
emits: ["refresh"],
setup(props, { emit, slots, attrs }) {
const size = ref("small");
const loading = ref(false);
const checkAll = ref(true);
const isFullscreen = ref(false);
const isIndeterminate = ref(false);
const instance = getCurrentInstance()!;
const isExpandAll = ref(props.isExpandAll);
let checkColumnList = getKeyList(cloneDeep(props?.columns), "title");
const checkedColumns = ref(getKeyList(cloneDeep(props?.columns), "title"));
const dynamicColumns = ref(cloneDeep(props?.columns));
const getDropdownItemStyle = computed(() => {
return s => {
return {
background:
s === size.value ? useEpThemeStoreHook().epThemeColor : "",
color: s === size.value ? "#fff" : "var(--el-text-color-primary)"
};
};
});
const iconClass = computed(() => {
return [
"text-black",
"dark:text-white",
"duration-100",
"hover:!text-primary",
"cursor-pointer",
"outline-none"
];
});
const topClass = computed(() => {
return [
"flex",
"justify-between",
"pt-[3px]",
"px-[11px]",
"border-b-[1px]",
"border-solid",
"border-[#dcdfe6]",
"dark:border-[#303030]"
];
});
function onReFresh() {
loading.value = true;
emit("refresh");
delay(500).then(() => (loading.value = false));
}
function onExpand() {
isExpandAll.value = !isExpandAll.value;
isExpandAll.value
? props.vxeTableRef.setAllTreeExpand(true)
: props.vxeTableRef.clearTreeExpand();
props.vxeTableRef.refreshColumn();
}
function reloadColumn() {
const curCheckedColumns = cloneDeep(dynamicColumns.value).filter(item =>
checkedColumns.value.includes(item.title)
);
props.vxeTableRef.reloadColumn(curCheckedColumns);
}
function handleCheckAllChange(val: boolean) {
checkedColumns.value = val ? checkColumnList : [];
isIndeterminate.value = false;
reloadColumn();
}
function handleCheckedColumnsChange(value: string[]) {
checkedColumns.value = value;
const checkedCount = value.length;
checkAll.value = checkedCount === checkColumnList.length;
isIndeterminate.value =
checkedCount > 0 && checkedCount < checkColumnList.length;
}
async function onReset() {
checkAll.value = true;
isIndeterminate.value = false;
dynamicColumns.value = cloneDeep(props?.columns);
checkColumnList = [];
checkColumnList = await getKeyList(cloneDeep(props?.columns), "title");
checkedColumns.value = getKeyList(cloneDeep(props?.columns), "title");
props.vxeTableRef.refreshColumn();
}
function changeSize(curSize: string) {
size.value = curSize;
props.vxeTableRef.refreshColumn();
}
const dropdown = {
dropdown: () => (
<el-dropdown-menu class="translation">
<el-dropdown-item
style={getDropdownItemStyle.value("medium")}
onClick={() => changeSize("medium")}
>
</el-dropdown-item>
<el-dropdown-item
style={getDropdownItemStyle.value("small")}
onClick={() => changeSize("small")}
>
</el-dropdown-item>
<el-dropdown-item
style={getDropdownItemStyle.value("mini")}
onClick={() => changeSize("mini")}
>
</el-dropdown-item>
</el-dropdown-menu>
)
};
/** 列展示拖拽排序 */
const rowDrop = (event: { preventDefault: () => void }) => {
event.preventDefault();
nextTick(() => {
const wrapper: HTMLElement = (
instance?.proxy?.$refs[`VxeGroupRef${unref(props.tableKey)}`] as any
).$el.firstElementChild;
Sortable.create(wrapper, {
animation: 300,
handle: ".drag-btn",
onEnd: ({ newIndex, oldIndex, item }) => {
const targetThElem = item;
const wrapperElem = targetThElem.parentNode as HTMLElement;
const oldColumn = dynamicColumns.value[oldIndex];
const newColumn = dynamicColumns.value[newIndex];
if (oldColumn?.fixed || newColumn?.fixed) {
// 当前列存在fixed属性 则不可拖拽
const oldThElem = wrapperElem.children[oldIndex] as HTMLElement;
if (newIndex > oldIndex) {
wrapperElem.insertBefore(targetThElem, oldThElem);
} else {
wrapperElem.insertBefore(
targetThElem,
oldThElem ? oldThElem.nextElementSibling : oldThElem
);
}
return;
}
const currentRow = dynamicColumns.value.splice(oldIndex, 1)[0];
dynamicColumns.value.splice(newIndex, 0, currentRow);
reloadColumn();
}
});
});
};
const isFixedColumn = (title: string) => {
return dynamicColumns.value.filter(
item => transformI18n(item.title) === transformI18n(title)
)[0].fixed
? true
: false;
};
const rendTippyProps = (content: string) => {
// https://vue-tippy.netlify.app/props
return {
content,
offset: [0, 18],
duration: [300, 0],
followCursor: true,
hideOnClick: "toggle"
};
};
const reference = {
reference: () => (
<SettingIcon
class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps("列设置")}
/>
)
};
return () => (
<>
<div
{...attrs}
class={[
"w-[99/100]",
"px-2",
"pb-2",
"bg-bg_color",
isFullscreen.value
? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
: "mt-2"
]}
>
<div class="flex justify-between w-full h-[60px] p-4">
{slots?.title ? (
slots.title()
) : (
<p class="font-bold truncate">{props.title}</p>
)}
<div class="flex items-center justify-around">
{slots?.buttons ? (
<div class="flex mr-4">{slots.buttons()}</div>
) : null}
{props.tree ? (
<>
<ExpandIcon
class={["w-[16px]", iconClass.value]}
style={{
transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}}
v-tippy={rendTippyProps(
isExpandAll.value ? "折叠" : "展开"
)}
onClick={() => onExpand()}
/>
<el-divider direction="vertical" />
</>
) : null}
<RefreshIcon
class={[
"w-[16px]",
iconClass.value,
loading.value ? "animate-spin" : ""
]}
v-tippy={rendTippyProps("刷新")}
onClick={() => onReFresh()}
/>
<el-divider direction="vertical" />
<el-dropdown
v-slots={dropdown}
trigger="click"
v-tippy={rendTippyProps("密度")}
>
<CollapseIcon class={["w-[16px]", iconClass.value]} />
</el-dropdown>
<el-divider direction="vertical" />
<el-popover
v-slots={reference}
placement="bottom-start"
popper-style={{ padding: 0 }}
width="200"
trigger="click"
>
<div class={[topClass.value]}>
<el-checkbox
class="!-mr-1"
label="列展示"
v-model={checkAll.value}
indeterminate={isIndeterminate.value}
onChange={value => handleCheckAllChange(value)}
/>
<el-button type="primary" link onClick={() => onReset()}>
</el-button>
</div>
<div class="pt-[6px] pl-[11px]">
<el-scrollbar max-height="36vh">
<el-checkbox-group
ref={`VxeGroupRef${unref(props.tableKey)}`}
modelValue={checkedColumns.value}
onChange={value => handleCheckedColumnsChange(value)}
>
<el-space
direction="vertical"
alignment="flex-start"
size={0}
>
{checkColumnList.map((item, index) => {
return (
<div class="flex items-center">
<DragIcon
class={[
"drag-btn w-[16px] mr-2",
isFixedColumn(item)
? "!cursor-no-drop"
: "!cursor-grab"
]}
onMouseenter={(event: {
preventDefault: () => void;
}) => rowDrop(event)}
/>
<el-checkbox
key={index}
label={item}
value={item}
onChange={reloadColumn}
>
<span
title={transformI18n(item)}
class="inline-block w-[120px] truncate hover:text-text_color_primary"
>
{transformI18n(item)}
</span>
</el-checkbox>
</div>
);
})}
</el-space>
</el-checkbox-group>
</el-scrollbar>
</div>
</el-popover>
<el-divider direction="vertical" />
<iconifyIconOffline
class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
onClick={() => (isFullscreen.value = !isFullscreen.value)}
/>
</div>
</div>
{slots.default({
size: size.value,
dynamicColumns: dynamicColumns.value
})}
</div>
</>
);
}
});

View File

@@ -35,7 +35,7 @@ export const getPlatformConfig = async (app: App): Promise<undefined> => {
}) })
.then(({ data: config }) => { .then(({ data: config }) => {
let $config = app.config.globalProperties.$config; let $config = app.config.globalProperties.$config;
// 自动注入项目配置 // 自动注入系统配置
if (app && $config && typeof config === "object") { if (app && $config && typeof config === "object") {
$config = Object.assign($config, config); $config = Object.assign($config, config);
app.config.globalProperties.$config = $config; app.config.globalProperties.$config = $config;

View File

@@ -2,7 +2,7 @@ import { hasAuth } from "@/router/utils";
import type { Directive, DirectiveBinding } from "vue"; import type { Directive, DirectiveBinding } from "vue";
export const auth: Directive = { export const auth: Directive = {
mounted(el: HTMLElement, binding: DirectiveBinding) { mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
const { value } = binding; const { value } = binding;
if (value) { if (value) {
!hasAuth(value) && el.parentNode?.removeChild(el); !hasAuth(value) && el.parentNode?.removeChild(el);

View File

@@ -3,13 +3,13 @@ import { useEventListener } from "@vueuse/core";
import { copyTextToClipboard } from "@pureadmin/utils"; import { copyTextToClipboard } from "@pureadmin/utils";
import type { Directive, DirectiveBinding } from "vue"; import type { Directive, DirectiveBinding } from "vue";
interface CopyEl extends HTMLElement { export interface CopyEl extends HTMLElement {
copyValue: string; copyValue: string;
} }
/** 文本复制指令(默认双击复制) */ /** 文本复制指令(默认双击复制) */
export const copy: Directive = { export const copy: Directive = {
mounted(el: CopyEl, binding: DirectiveBinding) { mounted(el: CopyEl, binding: DirectiveBinding<string>) {
const { value } = binding; const { value } = binding;
if (value) { if (value) {
el.copyValue = value; el.copyValue = value;

View File

@@ -2,4 +2,5 @@ export * from "./auth";
export * from "./copy"; export * from "./copy";
export * from "./longpress"; export * from "./longpress";
export * from "./optimize"; export * from "./optimize";
export * from "./perms";
export * from "./ripple"; export * from "./ripple";

View File

@@ -3,7 +3,7 @@ import type { Directive, DirectiveBinding } from "vue";
import { subBefore, subAfter, isFunction } from "@pureadmin/utils"; import { subBefore, subAfter, isFunction } from "@pureadmin/utils";
export const longpress: Directive = { export const longpress: Directive = {
mounted(el: HTMLElement, binding: DirectiveBinding) { mounted(el: HTMLElement, binding: DirectiveBinding<Function>) {
const cb = binding.value; const cb = binding.value;
if (cb && isFunction(cb)) { if (cb && isFunction(cb)) {
let timer = null; let timer = null;

View File

@@ -8,9 +8,22 @@ import {
import { useEventListener } from "@vueuse/core"; import { useEventListener } from "@vueuse/core";
import type { Directive, DirectiveBinding } from "vue"; import type { Directive, DirectiveBinding } from "vue";
export interface OptimizeOptions {
/** 事件名 */
event: string;
/** 事件触发的方法 */
fn: (...params: any) => any;
/** 是否立即执行 */
immediate?: boolean;
/** 防抖或节流的延迟时间(防抖默认:`200`毫秒、节流默认:`1000`毫秒) */
timeout?: number;
/** 传递的参数 */
params?: any;
}
/** 防抖v-optimize或v-optimize:debounce、节流v-optimize:throttle指令 */ /** 防抖v-optimize或v-optimize:debounce、节流v-optimize:throttle指令 */
export const optimize: Directive = { export const optimize: Directive = {
mounted(el: HTMLElement, binding: DirectiveBinding) { mounted(el: HTMLElement, binding: DirectiveBinding<OptimizeOptions>) {
const { value } = binding; const { value } = binding;
const optimizeType = binding.arg ?? "debounce"; const optimizeType = binding.arg ?? "debounce";
const type = ["debounce", "throttle"].find(t => t === optimizeType); const type = ["debounce", "throttle"].find(t => t === optimizeType);

View File

@@ -0,0 +1,15 @@
import { hasPerms } from "@/utils/auth";
import type { Directive, DirectiveBinding } from "vue";
export const perms: Directive = {
mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
const { value } = binding;
if (value) {
!hasPerms(value) && el.parentNode?.removeChild(el);
} else {
throw new Error(
"[Directive: perms]: need perms! Like v-perms=\"['btn.add','btn.edit']\""
);
}
}
};

View File

@@ -2,8 +2,10 @@ import "./index.scss";
import { isObject } from "@pureadmin/utils"; import { isObject } from "@pureadmin/utils";
import type { Directive, DirectiveBinding } from "vue"; import type { Directive, DirectiveBinding } from "vue";
interface RippleOptions { export interface RippleOptions {
/** 自定义`ripple`颜色,支持`tailwindcss` */
class?: string; class?: string;
/** 是否从中心扩散 */
center?: boolean; center?: boolean;
circle?: boolean; circle?: boolean;
} }
@@ -220,13 +222,6 @@ function updated(el: HTMLElement, binding: RippleDirectiveBinding) {
updateRipple(el, binding, wasEnabled); updateRipple(el, binding, wasEnabled);
} }
/**
* @description 指令 v-ripple
* @use 用法如下
* 1. v-ripple 代表启用基本的 ripple 功能
* 2. v-ripple="{ class: 'text-red' }" 代表自定义 ripple 颜色,支持 tailwindcss生效样式是 color
* 3. v-ripple.center 代表从中心扩散
*/
export const Ripple: Directive = { export const Ripple: Directive = {
mounted, mounted,
unmounted, unmounted,

View File

@@ -1,8 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import Footer from "./footer/index.vue"; import { useI18n } from "vue-i18n";
import LayFrame from "../lay-frame/index.vue";
import LayFooter from "../lay-footer/index.vue";
import { useTags } from "@/layout/hooks/useTag";
import { useGlobal, isNumber } from "@pureadmin/utils"; import { useGlobal, isNumber } from "@pureadmin/utils";
import KeepAliveFrame from "./keepAliveFrame/index.vue"; import BackTopIcon from "@/assets/svg/back_top.svg?component";
import backTop from "@/assets/svg/back_top.svg?component";
import { h, computed, Transition, defineComponent } from "vue"; import { h, computed, Transition, defineComponent } from "vue";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/permission";
@@ -10,6 +12,8 @@ const props = defineProps({
fixedHeader: Boolean fixedHeader: Boolean
}); });
const { t } = useI18n();
const { showModel } = useTags();
const { $storage, $config } = useGlobal<GlobalPropertiesApi>(); const { $storage, $config } = useGlobal<GlobalPropertiesApi>();
const isKeepAlive = computed(() => { const isKeepAlive = computed(() => {
@@ -49,9 +53,17 @@ const getMainWidth = computed(() => {
const getSectionStyle = computed(() => { const getSectionStyle = computed(() => {
return [ return [
hideTabs.value && layout ? "padding-top: 48px;" : "", hideTabs.value && layout ? "padding-top: 48px;" : "",
!hideTabs.value && layout ? "padding-top: 81px;" : "", !hideTabs.value && layout
? showModel.value == "chrome"
? "padding-top: 85px;"
: "padding-top: 81px;"
: "",
hideTabs.value && !layout.value ? "padding-top: 48px;" : "", hideTabs.value && !layout.value ? "padding-top: 48px;" : "",
!hideTabs.value && !layout.value ? "padding-top: 81px;" : "", !hideTabs.value && !layout.value
? showModel.value == "chrome"
? "padding-top: 85px;"
: "padding-top: 81px;"
: "",
props.fixedHeader props.fixedHeader
? "" ? ""
: `padding-top: 0;${ : `padding-top: 0;${
@@ -97,15 +109,15 @@ const transitionMain = defineComponent({
<template> <template>
<section <section
:class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']" :class="[fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
:style="getSectionStyle" :style="getSectionStyle"
> >
<router-view> <router-view>
<template #default="{ Component, route }"> <template #default="{ Component, route }">
<KeepAliveFrame :currComp="Component" :currRoute="route"> <LayFrame :currComp="Component" :currRoute="route">
<template #default="{ Comp, fullPath, frameInfo }"> <template #default="{ Comp, fullPath, frameInfo }">
<el-scrollbar <el-scrollbar
v-if="props.fixedHeader" v-if="fixedHeader"
:wrap-style="{ :wrap-style="{
display: 'flex', display: 'flex',
'flex-wrap': 'wrap', 'flex-wrap': 'wrap',
@@ -121,10 +133,10 @@ const transitionMain = defineComponent({
}" }"
> >
<el-backtop <el-backtop
title="回到顶部" :title="t('buttons.pureBackTop')"
target=".app-main .el-scrollbar__wrap" target=".app-main .el-scrollbar__wrap"
> >
<backTop /> <BackTopIcon />
</el-backtop> </el-backtop>
<div class="grow"> <div class="grow">
<transitionMain :route="route"> <transitionMain :route="route">
@@ -148,7 +160,7 @@ const transitionMain = defineComponent({
/> />
</transitionMain> </transitionMain>
</div> </div>
<Footer v-if="!hideFooter" /> <LayFooter v-if="!hideFooter" />
</el-scrollbar> </el-scrollbar>
<div v-else class="grow"> <div v-else class="grow">
<transitionMain :route="route"> <transitionMain :route="route">
@@ -173,12 +185,12 @@ const transitionMain = defineComponent({
</transitionMain> </transitionMain>
</div> </div>
</template> </template>
</KeepAliveFrame> </LayFrame>
</template> </template>
</router-view> </router-view>
<!-- 页脚 --> <!-- 页脚 -->
<Footer v-if="!hideFooter && !props.fixedHeader" /> <LayFooter v-if="!hideFooter && !fixedHeader" />
</section> </section>
</template> </template>

View File

@@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { getConfig } from "@/config"; import { getConfig } from "@/config";
import { useMultiFrame } from "@/layout/hooks/useMultiFrame";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags"; import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import { type Component, shallowRef, watch, computed } from "vue"; import { type Component, shallowRef, watch, computed } from "vue";
import { type RouteRecordRaw, RouteLocationNormalizedLoaded } from "vue-router"; import { type RouteRecordRaw, RouteLocationNormalizedLoaded } from "vue-router";
import { useMultiFrame } from "@/layout/components/keepAliveFrame/useMultiFrame";
const props = defineProps<{ const props = defineProps<{
currRoute: RouteLocationNormalizedLoaded; currRoute: RouteLocationNormalizedLoaded;
@@ -20,7 +20,7 @@ const keep = computed(() => {
!!props.currRoute.meta?.frameSrc !!props.currRoute.meta?.frameSrc
); );
}); });
// frameView // LayFrame
const normalComp = computed(() => !keep.value && props.currComp); const normalComp = computed(() => !keep.value && props.currComp);
watch(useMultiTagsStoreHook().multiTags, (tags: any) => { watch(useMultiTagsStoreHook().multiTags, (tags: any) => {
@@ -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 === props.currRoute.fullPath" class="w-full h-full"> <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
<slot <slot
:fullPath="fullPath" :fullPath="fullPath"
:Comp="Comp" :Comp="Comp"
@@ -74,6 +74,6 @@ watch(
</div> </div>
</template> </template>
<div v-show="!keep" class="w-full h-full"> <div v-show="!keep" class="w-full h-full">
<slot :Comp="normalComp" :fullPath="props.currRoute.fullPath" frameInfo /> <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
</div> </div>
</template> </template>

View File

@@ -1,16 +1,19 @@
<script setup lang="ts"> <script setup lang="ts">
import Search from "./search/index.vue";
import Notice from "./notice/index.vue";
import mixNav from "./sidebar/mixNav.vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import FullScreen from "./sidebar/fullScreen.vue"; import LaySearch from "../lay-search/index.vue";
import Breadcrumb from "./sidebar/breadCrumb.vue"; import LayNotice from "../lay-notice/index.vue";
import topCollapse from "./sidebar/topCollapse.vue"; import LayNavMix from "../lay-sidebar/NavMix.vue";
import { useTranslationLang } from "../hooks/useTranslationLang"; import { useTranslationLang } from "@/layout/hooks/useTranslationLang";
import globalization from "@/assets/svg/globalization.svg?component"; import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
import LaySidebarBreadCrumb from "../lay-sidebar/components/SidebarBreadCrumb.vue";
import LaySidebarTopCollapse from "../lay-sidebar/components/SidebarTopCollapse.vue";
import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line"; import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
import Setting from "@iconify-icons/ri/settings-3-line"; import Setting from "@iconify-icons/ri/settings-3-line";
import Check from "@iconify-icons/ep/check"; import Check from "@iconify-icons/ep/check";
const { const {
layout, layout,
device, device,
@@ -21,6 +24,7 @@ const {
userAvatar, userAvatar,
avatarsStyle, avatarsStyle,
toggleSideBar, toggleSideBar,
toAccountSettings,
getDropdownItemStyle, getDropdownItemStyle,
getDropdownItemClass getDropdownItemClass
} = useNav(); } = useNav();
@@ -30,26 +34,26 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
<template> <template>
<div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]"> <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
<topCollapse <LaySidebarTopCollapse
v-if="device === 'mobile'" v-if="device === 'mobile'"
class="hamburger-container" class="hamburger-container"
:is-active="pureApp.sidebar.opened" :is-active="pureApp.sidebar.opened"
@toggleClick="toggleSideBar" @toggleClick="toggleSideBar"
/> />
<Breadcrumb <LaySidebarBreadCrumb
v-if="layout !== 'mix' && device !== 'mobile'" v-if="layout !== 'mix' && device !== 'mobile'"
class="breadcrumb-container" class="breadcrumb-container"
/> />
<mixNav v-if="layout === 'mix'" /> <LayNavMix v-if="layout === 'mix'" />
<div v-if="layout === 'vertical'" class="vertical-header-right"> <div v-if="layout === 'vertical'" class="vertical-header-right">
<!-- 菜单搜索 --> <!-- 菜单搜索 -->
<Search id="header-search" /> <LaySearch id="header-search" />
<!-- 国际化 --> <!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click"> <el-dropdown id="header-translation" trigger="click">
<globalization <GlobalizationIcon
class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none" class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
/> />
<template #dropdown> <template #dropdown>
@@ -80,9 +84,9 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</template> </template>
</el-dropdown> </el-dropdown>
<!-- 全屏 --> <!-- 全屏 -->
<FullScreen id="full-screen" /> <LaySidebarFullScreen id="full-screen" />
<!-- 消息通知 --> <!-- 消息通知 -->
<Notice id="header-notice" /> <LayNotice id="header-notice" />
<!-- 退出登录 --> <!-- 退出登录 -->
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link navbar-bg-hover select-none"> <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -91,6 +95,13 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</span> </span>
<template #dropdown> <template #dropdown>
<el-dropdown-menu class="logout"> <el-dropdown-menu class="logout">
<el-dropdown-item @click="toAccountSettings">
<IconifyIconOffline
:icon="AccountSettingsIcon"
style="margin: 5px"
/>
{{ t("buttons.pureAccountSettings") }}
</el-dropdown-item>
<el-dropdown-item @click="logout"> <el-dropdown-item @click="logout">
<IconifyIconOffline <IconifyIconOffline
:icon="LogoutCircleRLine" :icon="LogoutCircleRLine"
@@ -103,7 +114,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</el-dropdown> </el-dropdown>
<span <span
class="set-icon navbar-bg-hover" class="set-icon navbar-bg-hover"
:title="t('buttons.pureSystemSet')" :title="t('buttons.pureOpenSystemSet')"
@click="onPanel" @click="onPanel"
> >
<IconifyIconOffline :icon="Setting" /> <IconifyIconOffline :icon="Setting" />
@@ -177,7 +188,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
} }
.logout { .logout {
max-width: 120px; width: 120px;
::v-deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
display: inline-flex; display: inline-flex;

View File

@@ -1,10 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { ListItem } from "./data"; import { ListItem } from "../data";
import { ref, PropType, nextTick } from "vue"; import { ref, PropType, nextTick } from "vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { deviceDetection } from "@pureadmin/utils"; import { deviceDetection } from "@pureadmin/utils";
const props = defineProps({ defineProps({
noticeItem: { noticeItem: {
type: Object as PropType<ListItem>, type: Object as PropType<ListItem>,
default: () => {} default: () => {}
@@ -52,9 +52,9 @@ function hoverDescription(event, description) {
class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]" class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
> >
<el-avatar <el-avatar
v-if="props.noticeItem.avatar" v-if="noticeItem.avatar"
:size="30" :size="30"
:src="props.noticeItem.avatar" :src="noticeItem.avatar"
class="notice-container-avatar" class="notice-container-avatar"
/> />
<div class="notice-container-text"> <div class="notice-container-text">
@@ -63,7 +63,7 @@ function hoverDescription(event, description) {
popper-class="notice-title-popper" popper-class="notice-title-popper"
:effect="tooltipEffect" :effect="tooltipEffect"
:disabled="!titleTooltip" :disabled="!titleTooltip"
:content="props.noticeItem.title" :content="noticeItem.title"
placement="top-start" placement="top-start"
:enterable="!isMobile" :enterable="!isMobile"
> >
@@ -72,16 +72,16 @@ function hoverDescription(event, description) {
class="notice-title-content" class="notice-title-content"
@mouseover="hoverTitle" @mouseover="hoverTitle"
> >
{{ props.noticeItem.title }} {{ noticeItem.title }}
</div> </div>
</el-tooltip> </el-tooltip>
<el-tag <el-tag
v-if="props.noticeItem?.extra" v-if="noticeItem?.extra"
:type="props.noticeItem?.status" :type="noticeItem?.status"
size="small" size="small"
class="notice-title-extra" class="notice-title-extra"
> >
{{ props.noticeItem?.extra }} {{ noticeItem?.extra }}
</el-tag> </el-tag>
</div> </div>
@@ -89,19 +89,19 @@ function hoverDescription(event, description) {
popper-class="notice-title-popper" popper-class="notice-title-popper"
:effect="tooltipEffect" :effect="tooltipEffect"
:disabled="!descriptionTooltip" :disabled="!descriptionTooltip"
:content="props.noticeItem.description" :content="noticeItem.description"
placement="top-start" placement="top-start"
> >
<div <div
ref="descriptionRef" ref="descriptionRef"
class="notice-text-description" class="notice-text-description"
@mouseover="hoverDescription($event, props.noticeItem.description)" @mouseover="hoverDescription($event, noticeItem.description)"
> >
{{ props.noticeItem.description }} {{ noticeItem.description }}
</div> </div>
</el-tooltip> </el-tooltip>
<div class="notice-text-datetime text-[#00000073] dark:text-white"> <div class="notice-text-datetime text-[#00000073] dark:text-white">
{{ props.noticeItem.datetime }} {{ noticeItem.datetime }}
</div> </div>
</div> </div>
</div> </div>

View File

@@ -0,0 +1,24 @@
<script setup lang="ts">
import { PropType } from "vue";
import { ListItem } from "../data";
import NoticeItem from "./NoticeItem.vue";
import { transformI18n } from "@/plugins/i18n";
defineProps({
list: {
type: Array as PropType<Array<ListItem>>,
default: () => []
},
emptyText: {
type: String,
default: ""
}
});
</script>
<template>
<div v-if="list.length">
<NoticeItem v-for="(item, index) in list" :key="index" :noticeItem="item" />
</div>
<el-empty v-else :description="transformI18n(emptyText)" />
</template>

View File

@@ -0,0 +1,99 @@
import { $t } from "@/plugins/i18n";
export interface ListItem {
avatar: string;
title: string;
datetime: string;
type: string;
description: string;
status?: "primary" | "success" | "warning" | "info" | "danger";
extra?: string;
}
export interface TabItem {
key: string;
name: string;
list: ListItem[];
emptyText: string;
}
export const noticesData: TabItem[] = [
{
key: "1",
name: $t("status.pureNotify"),
list: [],
emptyText: $t("status.pureNoNotify")
},
{
key: "2",
name: $t("status.pureMessage"),
list: [
{
avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile1.svg",
title: "小铭 评论了你",
description: "诚在于心,信在于行,诚信在于心行合一。",
datetime: "今天",
type: "2"
},
{
avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile2.svg",
title: "李白 回复了你",
description: "长风破浪会有时,直挂云帆济沧海。",
datetime: "昨天",
type: "2"
},
{
avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile5.svg",
title: "标题",
description:
"请将鼠标移动到此处以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
datetime: "时间",
type: "2"
}
],
emptyText: $t("status.pureNoMessage")
},
{
key: "3",
name: $t("status.pureTodo"),
list: [
{
avatar: "",
title: "第三方紧急代码变更",
description:
"小林提交于 2024-05-10需在 2024-05-11 前完成代码变更任务",
datetime: "",
extra: "马上到期",
status: "danger",
type: "3"
},
{
avatar: "",
title: "版本发布",
description: "指派小铭于 2024-06-18 前完成更新并发布",
datetime: "",
extra: "已耗时 8 天",
status: "warning",
type: "3"
},
{
avatar: "",
title: "新功能开发",
description: "开发多租户管理",
datetime: "",
extra: "进行中",
type: "3"
},
{
avatar: "",
title: "任务名称",
description: "任务需要在 2030-10-30 10:00 前启动",
datetime: "",
extra: "未开始",
status: "info",
type: "3"
}
],
emptyText: $t("status.pureNoTodo")
}
];

View File

@@ -1,22 +1,36 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref } from "vue"; import { useI18n } from "vue-i18n";
import { ref, computed } from "vue";
import { noticesData } from "./data"; import { noticesData } from "./data";
import NoticeList from "./noticeList.vue"; import NoticeList from "./components/NoticeList.vue";
import Bell from "@iconify-icons/ep/bell"; import BellIcon from "@iconify-icons/ep/bell";
const { t } = useI18n();
const noticesNum = ref(0); 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)); notices.value.map(v => (noticesNum.value += v.list.length));
const getLabel = computed(
() => item =>
t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
);
</script> </script>
<template> <template>
<el-dropdown trigger="click" placement="bottom-end"> <el-dropdown trigger="click" placement="bottom-end">
<span class="dropdown-badge navbar-bg-hover select-none"> <span
<el-badge :value="noticesNum" :max="99"> :class="[
'dropdown-badge',
'navbar-bg-hover',
'select-none',
Number(noticesNum) !== 0 && 'mr-[10px]'
]"
>
<el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
<span class="header-notice-icon"> <span class="header-notice-icon">
<IconifyIconOffline :icon="Bell" /> <IconifyIconOffline :icon="BellIcon" />
</span> </span>
</el-badge> </el-badge>
</span> </span>
@@ -30,18 +44,15 @@ notices.value.map(v => (noticesNum.value += v.list.length));
> >
<el-empty <el-empty
v-if="notices.length === 0" v-if="notices.length === 0"
description="暂无消息" :description="t('status.pureNoMessage')"
:image-size="60" :image-size="60"
/> />
<span v-else> <span v-else>
<template v-for="item in notices" :key="item.key"> <template v-for="item in notices" :key="item.key">
<el-tab-pane <el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
:label="`${item.name}(${item.list.length})`"
:name="`${item.key}`"
>
<el-scrollbar max-height="330px"> <el-scrollbar max-height="330px">
<div class="noticeList-container"> <div class="noticeList-container">
<NoticeList :list="item.list" /> <NoticeList :list="item.list" :emptyText="item.emptyText" />
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-tab-pane> </el-tab-pane>
@@ -60,7 +71,6 @@ notices.value.map(v => (noticesNum.value += v.list.length));
justify-content: center; justify-content: center;
width: 40px; width: 40px;
height: 48px; height: 48px;
margin-right: 10px;
cursor: pointer; cursor: pointer;
.header-notice-icon { .header-notice-icon {

View File

@@ -1,9 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { useI18n } from "vue-i18n";
import { emitter } from "@/utils/mitt"; import { emitter } from "@/utils/mitt";
import { onClickOutside } from "@vueuse/core"; import { onClickOutside } from "@vueuse/core";
import { ref, computed, onMounted, onBeforeUnmount } from "vue"; import { ref, computed, onMounted, onBeforeUnmount } from "vue";
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange"; import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
import Close from "@iconify-icons/ep/close"; import CloseIcon from "@iconify-icons/ep/close";
const target = ref(null); const target = ref(null);
const show = ref<Boolean>(false); const show = ref<Boolean>(false);
@@ -25,6 +26,7 @@ const iconClass = computed(() => {
]; ];
}); });
const { t } = useI18n();
const { onReset } = useDataThemeChange(); const { onReset } = useDataThemeChange();
onClickOutside(target, (event: any) => { onClickOutside(target, (event: any) => {
@@ -51,10 +53,12 @@ onBeforeUnmount(() => {
<div <div
class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]" class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
> >
<h4 class="dark:text-white">项目配置</h4> <h4 class="dark:text-white">
{{ t("panel.pureSystemSet") }}
</h4>
<span <span
v-tippy="{ v-tippy="{
content: '关闭配置', content: t('panel.pureCloseSystemSet'),
placement: 'bottom-start', placement: 'bottom-start',
zIndex: 41000 zIndex: 41000
}" }"
@@ -64,7 +68,7 @@ onBeforeUnmount(() => {
class="dark:text-white" class="dark:text-white"
width="18px" width="18px"
height="18px" height="18px"
:icon="Close" :icon="CloseIcon"
@click="show = !show" @click="show = !show"
/> />
</span> </span>
@@ -78,7 +82,7 @@ onBeforeUnmount(() => {
> >
<el-button <el-button
v-tippy="{ v-tippy="{
content: '清空缓存并返回登录页', content: t('panel.pureClearCacheAndToLogin'),
placement: 'left-start', placement: 'left-start',
zIndex: 41000 zIndex: 41000
}" }"
@@ -87,7 +91,7 @@ onBeforeUnmount(() => {
bg bg
@click="onReset" @click="onReset"
> >
清空缓存 {{ t("panel.pureClearCache") }}
</el-button> </el-button>
</div> </div>
</div> </div>

View File

@@ -1,37 +1,36 @@
<script setup lang="ts"> <script setup lang="ts">
import { useI18n } from "vue-i18n";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component"; import MdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
import enterOutlined from "@/assets/svg/enter_outlined.svg?component"; import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
import ArrowUpLine from "@iconify-icons/ri/arrow-up-line"; import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
import ArrowDownLine from "@iconify-icons/ri/arrow-down-line"; import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
const props = withDefaults(defineProps<{ total: number }>(), { withDefaults(defineProps<{ total: number }>(), {
total: 0 total: 0
}); });
const { t } = useI18n();
const { device } = useNav(); const { device } = useNav();
</script> </script>
<template> <template>
<div class="search-footer text-[#333] dark:text-white"> <div class="search-footer text-[#333] dark:text-white">
<span class="search-footer-item"> <span class="search-footer-item">
<enterOutlined class="icon" /> <EnterOutlined class="icon" />
确认 {{ t("buttons.pureConfirm") }}
</span> </span>
<span class="search-footer-item"> <span class="search-footer-item">
<IconifyIconOffline :icon="ArrowUpLine" class="icon" /> <IconifyIconOffline :icon="ArrowUpLine" class="icon" />
<IconifyIconOffline :icon="ArrowDownLine" class="icon" /> <IconifyIconOffline :icon="ArrowDownLine" class="icon" />
切换 {{ t("buttons.pureSwitch") }}
</span> </span>
<span class="search-footer-item"> <span class="search-footer-item">
<mdiKeyboardEsc class="icon" /> <MdiKeyboardEsc class="icon" />
关闭 {{ t("buttons.pureClose") }}
</span> </span>
<p <p v-if="device !== 'mobile' && total > 0" class="search-footer-total">
v-if="device !== 'mobile' && props.total > 0" {{ `${t("search.pureTotal")} ${total}` }}
class="search-footer-total"
>
{{ props.total }}
</p> </p>
</div> </div>
</template> </template>

View File

@@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import Sortable from "sortablejs"; import Sortable from "sortablejs";
import { useI18n } from "vue-i18n";
import SearchHistoryItem from "./SearchHistoryItem.vue"; import SearchHistoryItem from "./SearchHistoryItem.vue";
import type { optionsItem, dragItem, Props } from "../types"; import type { optionsItem, dragItem, Props } from "../types";
import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { useEpThemeStoreHook } from "@/store/modules/epTheme";
@@ -19,6 +20,7 @@ const innerHeight = ref();
/** 判断是否停止鼠标移入事件处理 */ /** 判断是否停止鼠标移入事件处理 */
const stopMouseEvent = ref(false); const stopMouseEvent = ref(false);
const { t } = useI18n();
const emit = defineEmits<Emits>(); const emit = defineEmits<Emits>();
const instance = getCurrentInstance()!; const instance = getCurrentInstance()!;
const props = withDefaults(defineProps<Props>(), {}); const props = withDefaults(defineProps<Props>(), {});
@@ -141,7 +143,9 @@ defineExpose({ handleScroll });
<template> <template>
<div ref="historyRef" class="history"> <div ref="historyRef" class="history">
<template v-if="historyList.length"> <template v-if="historyList.length">
<div :style="titleStyle">搜索历史</div> <div :style="titleStyle">
{{ t("search.pureHistory") }}
</div>
<div <div
v-for="(item, index) in historyList" v-for="(item, index) in historyList"
:key="item.path" :key="item.path"
@@ -160,7 +164,9 @@ defineExpose({ handleScroll });
</template> </template>
<template v-if="collectList.length"> <template v-if="collectList.length">
<div :style="titleStyle"> <div :style="titleStyle">
收藏{{ collectList.length > 1 ? "(可拖拽排序)" : "" }} {{
`${t("search.pureCollect")}${collectList.length > 1 ? t("search.pureDragSort") : ""}`
}}
</div> </div>
<div class="collect-container"> <div class="collect-container">
<div <div

View File

@@ -2,8 +2,8 @@
import type { optionsItem } from "../types"; import type { optionsItem } from "../types";
import { transformI18n } from "@/plugins/i18n"; import { transformI18n } from "@/plugins/i18n";
import { useRenderIcon } from "@/components/ReIcon/src/hooks"; import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import Star from "@iconify-icons/ep/star"; import StarIcon from "@iconify-icons/ep/star";
import Close from "@iconify-icons/ep/close"; import CloseIcon from "@iconify-icons/ep/close";
interface Props { interface Props {
item: optionsItem; item: optionsItem;
@@ -33,12 +33,12 @@ function handleDelete(item) {
</span> </span>
<IconifyIconOffline <IconifyIconOffline
v-show="item.type === 'history'" v-show="item.type === 'history'"
:icon="Star" :icon="StarIcon"
class="w-[18px] h-[18px] 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="Close" :icon="CloseIcon"
class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer" class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
@click.stop="handleDelete(item)" @click.stop="handleDelete(item)"
/> />

View File

@@ -6,14 +6,14 @@ 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";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/permission";
import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils"; import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils";
import Search from "@iconify-icons/ri/search-line"; import SearchIcon from "@iconify-icons/ri/search-line";
interface Props { interface Props {
/** 弹窗显隐 */ /** 弹窗显隐 */
@@ -29,7 +29,7 @@ const emit = defineEmits<Emits>();
const props = withDefaults(defineProps<Props>(), {}); const props = withDefaults(defineProps<Props>(), {});
const router = useRouter(); const router = useRouter();
const { locale } = useI18n(); const { t, locale } = useI18n();
const HISTORY_TYPE = "history"; const HISTORY_TYPE = "history";
const COLLECT_TYPE = "collect"; const COLLECT_TYPE = "collect";
@@ -293,19 +293,19 @@ onKeyStroke("ArrowDown", handleDown);
v-model="keyword" v-model="keyword"
size="large" size="large"
clearable clearable
placeholder="搜索菜单(中文模式下支持拼音搜索)" :placeholder="t('search.purePlaceholder')"
@input="handleSearch" @input="handleSearch"
> >
<template #prefix> <template #prefix>
<IconifyIconOffline <IconifyIconOffline
:icon="Search" :icon="SearchIcon"
class="text-primary w-[24px] h-[24px]" class="text-primary w-[24px] h-[24px]"
/> />
</template> </template>
</el-input> </el-input>
<div class="search-content"> <div class="search-content">
<el-scrollbar ref="scrollbarRef" max-height="calc(90vh - 140px)"> <el-scrollbar ref="scrollbarRef" max-height="calc(90vh - 140px)">
<el-empty v-if="showEmpty" description="暂无搜索结果" /> <el-empty v-if="showEmpty" :description="t('search.pureEmpty')" />
<SearchHistory <SearchHistory
v-if="showSearchHistory" v-if="showSearchHistory"
ref="historyRef" ref="historyRef"

View File

@@ -5,7 +5,7 @@ import { useResizeObserver } from "@pureadmin/utils";
import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { useRenderIcon } from "@/components/ReIcon/src/hooks"; import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import { ref, computed, getCurrentInstance, onMounted } from "vue"; import { ref, computed, getCurrentInstance, onMounted } from "vue";
import enterOutlined from "@/assets/svg/enter_outlined.svg?component"; import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
interface Emits { interface Emits {
(e: "update:value", val: string): void; (e: "update:value", val: string): void;
@@ -84,7 +84,7 @@ defineExpose({ handleScroll });
<span class="result-item-title"> <span class="result-item-title">
{{ transformI18n(item.meta?.title) }} {{ transformI18n(item.meta?.title) }}
</span> </span>
<enterOutlined /> <EnterOutlined />
</div> </div>
</div> </div>
</template> </template>

View File

@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { SearchModal } from "./components";
import { useBoolean } from "../../hooks/useBoolean"; import { useBoolean } from "../../hooks/useBoolean";
import SearchModal from "./components/SearchModal.vue";
const { bool: show, toggle } = useBoolean(); const { bool: show, toggle } = useBoolean();
function handleSearch() { function handleSearch() {

View File

@@ -9,8 +9,9 @@ import {
onUnmounted, onUnmounted,
onBeforeMount onBeforeMount
} from "vue"; } from "vue";
import panel from "../panel/index.vue"; import { useI18n } from "vue-i18n";
import { emitter } from "@/utils/mitt"; import { emitter } from "@/utils/mitt";
import LayPanel from "../lay-panel/index.vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { useAppStoreHook } from "@/store/modules/app"; import { useAppStoreHook } from "@/store/modules/app";
import { toggleTheme } from "@pureadmin/theme/dist/browser-utils"; import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
@@ -22,10 +23,11 @@ import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
import Check from "@iconify-icons/ep/check"; import Check from "@iconify-icons/ep/check";
import LeftArrow from "@iconify-icons/ri/arrow-left-s-line"; import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
import RightArrow from "@iconify-icons/ri/arrow-right-s-line"; import RightArrow from "@iconify-icons/ri/arrow-right-s-line";
import dayIcon from "@/assets/svg/day.svg?component"; import DayIcon from "@/assets/svg/day.svg?component";
import darkIcon from "@/assets/svg/dark.svg?component"; import DarkIcon from "@/assets/svg/dark.svg?component";
import systemIcon from "@/assets/svg/system.svg?component"; import SystemIcon from "@/assets/svg/system.svg?component";
const { t } = useI18n();
const { device } = useNav(); const { device } = useNav();
const { isDark } = useDark(); const { isDark } = useDark();
const { $storage } = useGlobal<GlobalPropertiesApi>(); const { $storage } = useGlobal<GlobalPropertiesApi>();
@@ -145,18 +147,20 @@ function setFalse(Doms): any {
} }
/** 页宽 */ /** 页宽 */
const stretchTypeOptions: Array<OptionsType> = [ const stretchTypeOptions = computed<Array<OptionsType>>(() => {
{ return [
label: "固定", {
tip: "紧凑页面,轻松找到所需信息", label: t("panel.pureStretchFixed"),
value: "fixed" tip: t("panel.pureStretchFixedTip"),
}, value: "fixed"
{ },
label: "自定义", {
tip: "最小1280、最大1600", label: t("panel.pureStretchCustom"),
value: "custom" tip: t("panel.pureStretchCustomTip"),
} value: "custom"
]; }
];
});
const setStretch = value => { const setStretch = value => {
settings.stretch = value; settings.stretch = value;
@@ -194,41 +198,48 @@ const pClass = computed(() => {
const themeOptions = computed<Array<OptionsType>>(() => { const themeOptions = computed<Array<OptionsType>>(() => {
return [ return [
{ {
label: "浅色", label: t("panel.pureOverallStyleLight"),
icon: dayIcon, icon: DayIcon,
theme: "light", theme: "light",
tip: "清新启航,点亮舒适的工作界面", tip: t("panel.pureOverallStyleLightTip"),
iconAttrs: { fill: isDark.value ? "#fff" : "#000" } iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
}, },
{ {
label: "深色", label: t("panel.pureOverallStyleDark"),
icon: darkIcon, icon: DarkIcon,
theme: "dark", theme: "dark",
tip: "月光序曲,沉醉于夜的静谧雅致", tip: t("panel.pureOverallStyleDarkTip"),
iconAttrs: { fill: isDark.value ? "#fff" : "#000" } iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
}, },
{ {
label: "自动", label: t("panel.pureOverallStyleSystem"),
icon: systemIcon, icon: SystemIcon,
theme: "system", theme: "system",
tip: "同步时光,界面随晨昏自然呼应", tip: t("panel.pureOverallStyleSystemTip"),
iconAttrs: { fill: isDark.value ? "#fff" : "#000" } iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
} }
]; ];
}); });
const markOptions: Array<OptionsType> = [ const markOptions = computed<Array<OptionsType>>(() => {
{ return [
label: "灵动", {
tip: "灵动标签,添趣生辉", label: t("panel.pureTagsStyleSmart"),
value: "smart" tip: t("panel.pureTagsStyleSmartTip"),
}, value: "smart"
{ },
label: "卡片", {
tip: "卡片标签,高效浏览", label: t("panel.pureTagsStyleCard"),
value: "card" tip: t("panel.pureTagsStyleCardTip"),
} value: "card"
]; },
{
label: t("panel.pureTagsStyleChrome"),
tip: t("panel.pureTagsStyleChromeTip"),
value: "chrome"
}
];
});
/** 设置导航模式 */ /** 设置导航模式 */
function setLayoutModel(layout: string) { function setLayoutModel(layout: string) {
@@ -291,7 +302,7 @@ function watchSystemThemeChange() {
} }
onBeforeMount(() => { onBeforeMount(() => {
/* 初始化项目配置 */ /* 初始化系统配置 */
nextTick(() => { nextTick(() => {
watchSystemThemeChange(); watchSystemThemeChange();
settings.greyVal && settings.greyVal &&
@@ -307,10 +318,11 @@ onUnmounted(() => removeMatchMedia);
</script> </script>
<template> <template>
<panel> <LayPanel>
<div class="p-5"> <div class="p-5">
<p :class="pClass">整体风格</p> <p :class="pClass">{{ t("panel.pureOverallStyle") }}</p>
<Segmented <Segmented
resize
class="select-none" class="select-none"
:modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0" :modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0"
:options="themeOptions" :options="themeOptions"
@@ -326,7 +338,7 @@ onUnmounted(() => removeMatchMedia);
" "
/> />
<p :class="['mt-5', pClass]">主题色</p> <p :class="['mt-5', pClass]">{{ t("panel.pureThemeColor") }}</p>
<ul class="theme-color"> <ul class="theme-color">
<li <li
v-for="(item, index) in themeColors" v-for="(item, index) in themeColors"
@@ -345,12 +357,12 @@ onUnmounted(() => removeMatchMedia);
</li> </li>
</ul> </ul>
<p :class="['mt-5', pClass]">导航模式</p> <p :class="['mt-5', pClass]">{{ t("panel.pureLayoutModel") }}</p>
<ul class="pure-theme"> <ul class="pure-theme">
<li <li
ref="verticalRef" ref="verticalRef"
v-tippy="{ v-tippy="{
content: '左侧菜单,亲切熟悉', content: t('panel.pureVerticalTip'),
zIndex: 41000 zIndex: 41000
}" }"
:class="layoutTheme.layout === 'vertical' ? 'is-select' : ''" :class="layoutTheme.layout === 'vertical' ? 'is-select' : ''"
@@ -363,7 +375,7 @@ onUnmounted(() => removeMatchMedia);
v-if="device !== 'mobile'" v-if="device !== 'mobile'"
ref="horizontalRef" ref="horizontalRef"
v-tippy="{ v-tippy="{
content: '顶部菜单,简洁概览', content: t('panel.pureHorizontalTip'),
zIndex: 41000 zIndex: 41000
}" }"
:class="layoutTheme.layout === 'horizontal' ? 'is-select' : ''" :class="layoutTheme.layout === 'horizontal' ? 'is-select' : ''"
@@ -376,7 +388,7 @@ onUnmounted(() => removeMatchMedia);
v-if="device !== 'mobile'" v-if="device !== 'mobile'"
ref="mixRef" ref="mixRef"
v-tippy="{ v-tippy="{
content: '混合菜单,灵活多变', content: t('panel.pureMixTip'),
zIndex: 41000 zIndex: 41000
}" }"
:class="layoutTheme.layout === 'mix' ? 'is-select' : ''" :class="layoutTheme.layout === 'mix' ? 'is-select' : ''"
@@ -388,8 +400,9 @@ onUnmounted(() => removeMatchMedia);
</ul> </ul>
<span v-if="useAppStoreHook().getViewportWidth > 1280"> <span v-if="useAppStoreHook().getViewportWidth > 1280">
<p :class="['mt-5', pClass]">页宽</p> <p :class="['mt-5', pClass]">{{ t("panel.pureStretch") }}</p>
<Segmented <Segmented
resize
class="mb-2 select-none" class="mb-2 select-none"
:modelValue="isNumber(settings.stretch) ? 1 : 0" :modelValue="isNumber(settings.stretch) ? 1 : 0"
:options="stretchTypeOptions" :options="stretchTypeOptions"
@@ -430,53 +443,56 @@ onUnmounted(() => removeMatchMedia);
</button> </button>
</span> </span>
<p :class="['mt-4', pClass]">页签风格</p> <p :class="['mt-4', pClass]">{{ t("panel.pureTagsStyle") }}</p>
<Segmented <Segmented
resize
class="select-none" class="select-none"
:modelValue="markValue === 'smart' ? 0 : 1" :modelValue="markValue === 'smart' ? 0 : markValue === 'card' ? 1 : 2"
:options="markOptions" :options="markOptions"
@change="onChange" @change="onChange"
/> />
<p class="mt-5 font-medium text-sm dark:text-white">界面显示</p> <p class="mt-5 font-medium text-sm dark:text-white">
{{ t("panel.pureInterfaceDisplay") }}
</p>
<ul class="setting"> <ul class="setting">
<li> <li>
<span class="dark:text-white">灰色模式</span> <span class="dark:text-white">{{ t("panel.pureGreyModel") }}</span>
<el-switch <el-switch
v-model="settings.greyVal" v-model="settings.greyVal"
inline-prompt inline-prompt
active-text="" :active-text="t('buttons.pureOpenText')"
inactive-text="" :inactive-text="t('buttons.pureCloseText')"
@change="greyChange" @change="greyChange"
/> />
</li> </li>
<li> <li>
<span class="dark:text-white">色弱模式</span> <span class="dark:text-white">{{ t("panel.pureWeakModel") }}</span>
<el-switch <el-switch
v-model="settings.weakVal" v-model="settings.weakVal"
inline-prompt inline-prompt
active-text="" :active-text="t('buttons.pureOpenText')"
inactive-text="" :inactive-text="t('buttons.pureCloseText')"
@change="weekChange" @change="weekChange"
/> />
</li> </li>
<li> <li>
<span class="dark:text-white">隐藏标签页</span> <span class="dark:text-white">{{ t("panel.pureHiddenTags") }}</span>
<el-switch <el-switch
v-model="settings.tabsVal" v-model="settings.tabsVal"
inline-prompt inline-prompt
active-text="" :active-text="t('buttons.pureOpenText')"
inactive-text="" :inactive-text="t('buttons.pureCloseText')"
@change="tagsChange" @change="tagsChange"
/> />
</li> </li>
<li> <li>
<span class="dark:text-white">隐藏页脚</span> <span class="dark:text-white">{{ t("panel.pureHiddenFooter") }}</span>
<el-switch <el-switch
v-model="settings.hideFooter" v-model="settings.hideFooter"
inline-prompt inline-prompt
active-text="" :active-text="t('buttons.pureOpenText')"
inactive-text="" :inactive-text="t('buttons.pureCloseText')"
@change="hideFooterChange" @change="hideFooterChange"
/> />
</li> </li>
@@ -487,24 +503,26 @@ onUnmounted(() => removeMatchMedia);
inline-prompt inline-prompt
:active-value="true" :active-value="true"
:inactive-value="false" :inactive-value="false"
active-text="" :active-text="t('buttons.pureOpenText')"
inactive-text="" :inactive-text="t('buttons.pureCloseText')"
@change="logoChange" @change="logoChange"
/> />
</li> </li>
<li> <li>
<span class="dark:text-white">页签持久化</span> <span class="dark:text-white">
{{ t("panel.pureMultiTagsCache") }}
</span>
<el-switch <el-switch
v-model="settings.multiTagsCache" v-model="settings.multiTagsCache"
inline-prompt inline-prompt
active-text="" :active-text="t('buttons.pureOpenText')"
inactive-text="" :inactive-text="t('buttons.pureCloseText')"
@change="multiTagsCacheChange" @change="multiTagsCacheChange"
/> />
</li> </li>
</ul> </ul>
</div> </div>
</panel> </LayPanel>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@@ -1,31 +1,41 @@
<script setup lang="ts"> <script setup lang="ts">
import Search from "../search/index.vue"; import { emitter } from "@/utils/mitt";
import Notice from "../notice/index.vue";
import FullScreen from "./fullScreen.vue";
import SidebarItem from "./sidebarItem.vue";
import { isAllEmpty } from "@pureadmin/utils";
import { ref, nextTick, computed } from "vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import LaySearch from "../lay-search/index.vue";
import LayNotice from "../lay-notice/index.vue";
import { responsiveStorageNameSpace } from "@/config";
import { ref, nextTick, computed, onMounted } from "vue";
import { storageLocal, isAllEmpty } from "@pureadmin/utils";
import { useTranslationLang } from "../../hooks/useTranslationLang"; import { useTranslationLang } from "../../hooks/useTranslationLang";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/permission";
import globalization from "@/assets/svg/globalization.svg?component"; import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line"; import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
import Setting from "@iconify-icons/ri/settings-3-line"; import Setting from "@iconify-icons/ri/settings-3-line";
import Check from "@iconify-icons/ep/check"; import Check from "@iconify-icons/ep/check";
const menuRef = ref(); const menuRef = ref();
const showLogo = ref(
storageLocal().getItem<StorageConfigs>(
`${responsiveStorageNameSpace()}configure`
)?.showLogo ?? true
);
const { t, route, locale, translationCh, translationEn } = const { t, route, locale, translationCh, translationEn } =
useTranslationLang(menuRef); useTranslationLang(menuRef);
const { const {
title, title,
logout, logout,
backTopMenu,
onPanel, onPanel,
getLogo, getLogo,
username, username,
userAvatar, userAvatar,
backTopMenu,
avatarsStyle, avatarsStyle,
toAccountSettings,
getDropdownItemStyle, getDropdownItemStyle,
getDropdownItemClass getDropdownItemClass
} = useNav(); } = useNav();
@@ -37,6 +47,12 @@ const defaultActive = computed(() =>
nextTick(() => { nextTick(() => {
menuRef.value?.handleResize(); menuRef.value?.handleResize();
}); });
onMounted(() => {
emitter.on("logoChange", key => {
showLogo.value = key;
});
});
</script> </script>
<template> <template>
@@ -44,19 +60,18 @@ nextTick(() => {
v-loading="usePermissionStoreHook().wholeMenus.length === 0" v-loading="usePermissionStoreHook().wholeMenus.length === 0"
class="horizontal-header" class="horizontal-header"
> >
<div class="horizontal-header-left" @click="backTopMenu"> <div v-if="showLogo" class="horizontal-header-left" @click="backTopMenu">
<img :src="getLogo()" alt="logo" /> <img :src="getLogo()" alt="logo" />
<span>{{ title }}</span> <span>{{ title }}</span>
</div> </div>
<el-menu <el-menu
ref="menuRef" ref="menuRef"
router
mode="horizontal" mode="horizontal"
popper-class="pure-scrollbar" popper-class="pure-scrollbar"
class="horizontal-header-menu" class="horizontal-header-menu"
:default-active="defaultActive" :default-active="defaultActive"
> >
<sidebar-item <LaySidebarItem
v-for="route in usePermissionStoreHook().wholeMenus" v-for="route in usePermissionStoreHook().wholeMenus"
:key="route.path" :key="route.path"
:item="route" :item="route"
@@ -65,10 +80,10 @@ nextTick(() => {
</el-menu> </el-menu>
<div class="horizontal-header-right"> <div class="horizontal-header-right">
<!-- 菜单搜索 --> <!-- 菜单搜索 -->
<Search id="header-search" /> <LaySearch id="header-search" />
<!-- 国际化 --> <!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click"> <el-dropdown id="header-translation" trigger="click">
<globalization <GlobalizationIcon
class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none" class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
/> />
<template #dropdown> <template #dropdown>
@@ -97,9 +112,9 @@ nextTick(() => {
</template> </template>
</el-dropdown> </el-dropdown>
<!-- 全屏 --> <!-- 全屏 -->
<FullScreen id="full-screen" /> <LaySidebarFullScreen id="full-screen" />
<!-- 消息通知 --> <!-- 消息通知 -->
<Notice id="header-notice" /> <LayNotice id="header-notice" />
<!-- 退出登录 --> <!-- 退出登录 -->
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link navbar-bg-hover"> <span class="el-dropdown-link navbar-bg-hover">
@@ -107,6 +122,13 @@ nextTick(() => {
<p v-if="username" class="dark:text-white">{{ username }}</p> <p v-if="username" class="dark:text-white">{{ username }}</p>
</span> </span>
<template #dropdown> <template #dropdown>
<el-dropdown-item @click="toAccountSettings">
<IconifyIconOffline
:icon="AccountSettingsIcon"
style="margin: 5px"
/>
{{ t("buttons.pureAccountSettings") }}
</el-dropdown-item>
<el-dropdown-menu class="logout"> <el-dropdown-menu class="logout">
<el-dropdown-item @click="logout"> <el-dropdown-item @click="logout">
<IconifyIconOffline <IconifyIconOffline
@@ -120,7 +142,7 @@ nextTick(() => {
</el-dropdown> </el-dropdown>
<span <span
class="set-icon navbar-bg-hover" class="set-icon navbar-bg-hover"
:title="t('buttons.pureSystemSet')" :title="t('buttons.pureOpenSystemSet')"
@click="onPanel" @click="onPanel"
> >
<IconifyIconOffline :icon="Setting" /> <IconifyIconOffline :icon="Setting" />
@@ -151,7 +173,7 @@ nextTick(() => {
} }
.logout { .logout {
max-width: 120px; width: 120px;
::v-deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
display: inline-flex; display: inline-flex;

View File

@@ -1,17 +1,19 @@
<script setup lang="ts"> <script setup lang="ts">
import extraIcon from "./extraIcon.vue";
import Search from "../search/index.vue";
import Notice from "../notice/index.vue";
import FullScreen from "./fullScreen.vue";
import { isAllEmpty } from "@pureadmin/utils"; import { isAllEmpty } from "@pureadmin/utils";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { transformI18n } from "@/plugins/i18n"; import { transformI18n } from "@/plugins/i18n";
import LaySearch from "../lay-search/index.vue";
import LayNotice from "../lay-notice/index.vue";
import { ref, toRaw, watch, onMounted, nextTick } from "vue"; import { ref, toRaw, watch, onMounted, nextTick } from "vue";
import { useRenderIcon } from "@/components/ReIcon/src/hooks"; import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import { getParentPaths, findRouteByPath } from "@/router/utils"; import { getParentPaths, findRouteByPath } from "@/router/utils";
import { useTranslationLang } from "../../hooks/useTranslationLang"; import { useTranslationLang } from "../../hooks/useTranslationLang";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/permission";
import globalization from "@/assets/svg/globalization.svg?component"; import LaySidebarExtraIcon from "../lay-sidebar/components/SidebarExtraIcon.vue";
import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line"; import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
import Setting from "@iconify-icons/ri/settings-3-line"; import Setting from "@iconify-icons/ri/settings-3-line";
import Check from "@iconify-icons/ep/check"; import Check from "@iconify-icons/ep/check";
@@ -30,6 +32,7 @@ const {
userAvatar, userAvatar,
getDivStyle, getDivStyle,
avatarsStyle, avatarsStyle,
toAccountSettings,
getDropdownItemStyle, getDropdownItemStyle,
getDropdownItemClass getDropdownItemClass
} = useNav(); } = useNav();
@@ -91,17 +94,17 @@ watch(
<span class="select-none"> <span class="select-none">
{{ transformI18n(route.meta.title) }} {{ transformI18n(route.meta.title) }}
</span> </span>
<extraIcon :extraIcon="route.meta.extraIcon" /> <LaySidebarExtraIcon :extraIcon="route.meta.extraIcon" />
</div> </div>
</template> </template>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<div class="horizontal-header-right"> <div class="horizontal-header-right">
<!-- 菜单搜索 --> <!-- 菜单搜索 -->
<Search id="header-search" /> <LaySearch id="header-search" />
<!-- 国际化 --> <!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click"> <el-dropdown id="header-translation" trigger="click">
<globalization <GlobalizationIcon
class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none" class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
/> />
<template #dropdown> <template #dropdown>
@@ -130,9 +133,9 @@ watch(
</template> </template>
</el-dropdown> </el-dropdown>
<!-- 全屏 --> <!-- 全屏 -->
<FullScreen id="full-screen" /> <LaySidebarFullScreen id="full-screen" />
<!-- 消息通知 --> <!-- 消息通知 -->
<Notice id="header-notice" /> <LayNotice id="header-notice" />
<!-- 退出登录 --> <!-- 退出登录 -->
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link navbar-bg-hover select-none"> <span class="el-dropdown-link navbar-bg-hover select-none">
@@ -140,6 +143,13 @@ watch(
<p v-if="username" class="dark:text-white">{{ username }}</p> <p v-if="username" class="dark:text-white">{{ username }}</p>
</span> </span>
<template #dropdown> <template #dropdown>
<el-dropdown-item @click="toAccountSettings">
<IconifyIconOffline
:icon="AccountSettingsIcon"
style="margin: 5px"
/>
{{ t("buttons.pureAccountSettings") }}
</el-dropdown-item>
<el-dropdown-menu class="logout"> <el-dropdown-menu class="logout">
<el-dropdown-item @click="logout"> <el-dropdown-item @click="logout">
<IconifyIconOffline <IconifyIconOffline
@@ -153,7 +163,7 @@ watch(
</el-dropdown> </el-dropdown>
<span <span
class="set-icon navbar-bg-hover" class="set-icon navbar-bg-hover"
:title="t('buttons.pureSystemSet')" :title="t('buttons.pureOpenSystemSet')"
@click="onPanel" @click="onPanel"
> >
<IconifyIconOffline :icon="Setting" /> <IconifyIconOffline :icon="Setting" />
@@ -184,7 +194,7 @@ watch(
} }
.logout { .logout {
max-width: 120px; width: 120px;
::v-deep(.el-dropdown-menu__item) { ::v-deep(.el-dropdown-menu__item) {
display: inline-flex; display: inline-flex;

View File

@@ -1,16 +1,16 @@
<script setup lang="ts"> <script setup lang="ts">
import Logo from "./logo.vue";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import { emitter } from "@/utils/mitt"; import { emitter } from "@/utils/mitt";
import SidebarItem from "./sidebarItem.vue";
import LeftCollapse from "./leftCollapse.vue";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import CenterCollapse from "./centerCollapse.vue";
import { responsiveStorageNameSpace } from "@/config"; import { responsiveStorageNameSpace } from "@/config";
import { storageLocal, isAllEmpty } from "@pureadmin/utils"; import { storageLocal, isAllEmpty } from "@pureadmin/utils";
import { findRouteByPath, getParentPaths } from "@/router/utils"; import { findRouteByPath, getParentPaths } from "@/router/utils";
import { usePermissionStoreHook } from "@/store/modules/permission"; import { usePermissionStoreHook } from "@/store/modules/permission";
import { ref, computed, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, computed, watch, onMounted, onBeforeUnmount } from "vue";
import LaySidebarLogo from "../lay-sidebar/components/SidebarLogo.vue";
import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
import LaySidebarLeftCollapse from "../lay-sidebar/components/SidebarLeftCollapse.vue";
import LaySidebarCenterCollapse from "../lay-sidebar/components/SidebarCenterCollapse.vue";
const route = useRoute(); const route = useRoute();
const isShow = ref(false); const isShow = ref(false);
@@ -93,13 +93,12 @@ onBeforeUnmount(() => {
@mouseenter.prevent="isShow = true" @mouseenter.prevent="isShow = true"
@mouseleave.prevent="isShow = false" @mouseleave.prevent="isShow = false"
> >
<Logo v-if="showLogo" :collapse="isCollapse" /> <LaySidebarLogo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar <el-scrollbar
wrap-class="scrollbar-wrapper" wrap-class="scrollbar-wrapper"
:class="[device === 'mobile' ? 'mobile' : 'pc']" :class="[device === 'mobile' ? 'mobile' : 'pc']"
> >
<el-menu <el-menu
router
unique-opened unique-opened
mode="vertical" mode="vertical"
popper-class="pure-scrollbar" popper-class="pure-scrollbar"
@@ -109,7 +108,7 @@ onBeforeUnmount(() => {
:popper-effect="tooltipEffect" :popper-effect="tooltipEffect"
:default-active="defaultActive" :default-active="defaultActive"
> >
<sidebar-item <LaySidebarItem
v-for="routes in menuData" v-for="routes in menuData"
:key="routes.path" :key="routes.path"
:item="routes" :item="routes"
@@ -118,12 +117,12 @@ onBeforeUnmount(() => {
/> />
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
<CenterCollapse <LaySidebarCenterCollapse
v-if="device !== 'mobile' && (isShow || isCollapse)" v-if="device !== 'mobile' && (isShow || isCollapse)"
:is-active="pureApp.sidebar.opened" :is-active="pureApp.sidebar.opened"
@toggleClick="toggleSideBar" @toggleClick="toggleSideBar"
/> />
<LeftCollapse <LaySidebarLeftCollapse
v-if="device !== 'mobile'" v-if="device !== 'mobile'"
:is-active="pureApp.sidebar.opened" :is-active="pureApp.sidebar.opened"
@toggleClick="toggleSideBar" @toggleClick="toggleSideBar"

View File

@@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from "vue"; import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { useGlobal } from "@pureadmin/utils"; import { useGlobal } from "@pureadmin/utils";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
@@ -9,10 +10,11 @@ interface Props {
isActive: boolean; isActive: boolean;
} }
const props = withDefaults(defineProps<Props>(), { withDefaults(defineProps<Props>(), {
isActive: false isActive: false
}); });
const { t } = useI18n();
const { tooltipEffect } = useNav(); const { tooltipEffect } = useNav();
const iconClass = computed(() => { const iconClass = computed(() => {
@@ -34,7 +36,9 @@ const toggleClick = () => {
<template> <template>
<div <div
v-tippy="{ v-tippy="{
content: props.isActive ? '点击折叠' : '点击展开', content: isActive
? t('buttons.pureClickCollapse')
: t('buttons.pureClickExpand'),
theme: tooltipEffect, theme: tooltipEffect,
hideOnClick: 'toggle', hideOnClick: 'toggle',
placement: 'right' placement: 'right'
@@ -45,7 +49,7 @@ const toggleClick = () => {
<IconifyIconOffline <IconifyIconOffline
:icon="ArrowLeft" :icon="ArrowLeft"
:class="[iconClass, themeColor === 'light' ? '' : 'text-primary']" :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
:style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }" :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
/> />
</div> </div>
</template> </template>

View File

@@ -2,7 +2,7 @@
import { toRaw } from "vue"; import { toRaw } from "vue";
import { useRenderIcon } from "@/components/ReIcon/src/hooks"; import { useRenderIcon } from "@/components/ReIcon/src/hooks";
const props = defineProps({ defineProps({
extraIcon: { extraIcon: {
type: String, type: String,
default: "" default: ""
@@ -11,9 +11,9 @@ const props = defineProps({
</script> </script>
<template> <template>
<div v-if="props.extraIcon" class="flex justify-center items-center"> <div v-if="extraIcon" class="flex justify-center items-center">
<component <component
:is="useRenderIcon(toRaw(props.extraIcon))" :is="useRenderIcon(toRaw(extraIcon))"
class="w-[30px] h-[30px]" class="w-[30px] h-[30px]"
/> />
</div> </div>

View File

@@ -1,12 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import path from "path"; import path from "path";
import { getConfig } from "@/config"; import { getConfig } from "@/config";
import LinkItem from "./linkItem.vue"; import { menuType } from "@/layout/types";
import { menuType } from "../../types";
import extraIcon from "./extraIcon.vue";
import { ReText } from "@/components/ReText"; import { ReText } from "@/components/ReText";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
import { transformI18n } from "@/plugins/i18n"; import { transformI18n } from "@/plugins/i18n";
import SidebarLinkItem from "./SidebarLinkItem.vue";
import SidebarExtraIcon from "./SidebarExtraIcon.vue";
import { useRenderIcon } from "@/components/ReIcon/src/hooks"; import { useRenderIcon } from "@/components/ReIcon/src/hooks";
import { import {
type PropType, type PropType,
@@ -106,9 +106,9 @@ function resolvePath(routePath) {
</script> </script>
<template> <template>
<link-item <SidebarLinkItem
v-if=" v-if="
hasOneShowingChild(props.item.children, props.item) && hasOneShowingChild(item.children, item) &&
(!onlyOneChild.children || onlyOneChild.noShowingChildren) (!onlyOneChild.children || onlyOneChild.noShowingChildren)
" "
:to="item" :to="item"
@@ -120,7 +120,7 @@ function resolvePath(routePath) {
v-bind="attrs" v-bind="attrs"
> >
<div <div
v-if="toRaw(props.item.meta.icon)" v-if="toRaw(item.meta.icon)"
class="sub-menu-icon" class="sub-menu-icon"
:style="getSubMenuIconStyle" :style="getSubMenuIconStyle"
> >
@@ -128,24 +128,24 @@ function resolvePath(routePath) {
:is=" :is="
useRenderIcon( useRenderIcon(
toRaw(onlyOneChild.meta.icon) || toRaw(onlyOneChild.meta.icon) ||
(props.item.meta && toRaw(props.item.meta.icon)) (item.meta && toRaw(item.meta.icon))
) )
" "
/> />
</div> </div>
<el-text <el-text
v-if=" v-if="
(!props.item?.meta.icon && (!item?.meta.icon &&
isCollapse && isCollapse &&
layout === 'vertical' && layout === 'vertical' &&
props.item?.pathList?.length === 1) || item?.pathList?.length === 1) ||
(!onlyOneChild.meta.icon && (!onlyOneChild.meta.icon &&
isCollapse && isCollapse &&
layout === 'mix' && layout === 'mix' &&
props.item?.pathList?.length === 2) item?.pathList?.length === 2)
" "
truncated truncated
class="!px-4 !text-inherit" class="!w-full !pl-4 !text-inherit"
> >
{{ transformI18n(onlyOneChild.meta.title) }} {{ transformI18n(onlyOneChild.meta.title) }}
</el-text> </el-text>
@@ -157,61 +157,62 @@ function resolvePath(routePath) {
offset: [0, -10], offset: [0, -10],
theme: tooltipEffect theme: tooltipEffect
}" }"
class="!text-inherit" class="!w-full !text-inherit"
> >
{{ transformI18n(onlyOneChild.meta.title) }} {{ transformI18n(onlyOneChild.meta.title) }}
</ReText> </ReText>
<extraIcon :extraIcon="onlyOneChild.meta.extraIcon" /> <SidebarExtraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
</div> </div>
</template> </template>
</el-menu-item> </el-menu-item>
</link-item> </SidebarLinkItem>
<el-sub-menu <el-sub-menu
v-else v-else
ref="subMenu" ref="subMenu"
teleported teleported
:index="resolvePath(props.item.path)" :index="resolvePath(item.path)"
v-bind="expandCloseIcon" v-bind="expandCloseIcon"
> >
<template #title> <template #title>
<div <div
v-if="toRaw(props.item.meta.icon)" v-if="toRaw(item.meta.icon)"
:style="getSubMenuIconStyle" :style="getSubMenuIconStyle"
class="sub-menu-icon" class="sub-menu-icon"
> >
<component <component :is="useRenderIcon(item.meta && toRaw(item.meta.icon))" />
:is="useRenderIcon(props.item.meta && toRaw(props.item.meta.icon))"
/>
</div> </div>
<ReText <ReText
v-if=" v-if="
!( layout === 'mix' && toRaw(item.meta.icon)
layout === 'vertical' && ? !isCollapse || item?.pathList?.length !== 2
isCollapse && : !(
toRaw(props.item.meta.icon) && layout === 'vertical' &&
props.item.parentId === null isCollapse &&
) toRaw(item.meta.icon) &&
item.parentId === null
)
" "
:tippyProps="{ :tippyProps="{
offset: [0, -10], offset: [0, -10],
theme: tooltipEffect theme: tooltipEffect
}" }"
:class="{ :class="{
'!w-full': true,
'!text-inherit': true, '!text-inherit': true,
'!px-4': '!pl-4':
layout !== 'horizontal' && layout !== 'horizontal' &&
isCollapse && isCollapse &&
!toRaw(props.item.meta.icon) && !toRaw(item.meta.icon) &&
props.item.parentId === null item.parentId === null
}" }"
> >
{{ transformI18n(props.item.meta.title) }} {{ transformI18n(item.meta.title) }}
</ReText> </ReText>
<extraIcon v-if="!isCollapse" :extraIcon="props.item.meta.extraIcon" /> <SidebarExtraIcon v-if="!isCollapse" :extraIcon="item.meta.extraIcon" />
</template> </template>
<sidebar-item <sidebar-item
v-for="child in props.item.children" v-for="child in item.children"
:key="child.path" :key="child.path"
:is-nest="true" :is-nest="true"
:item="child" :item="child"

View File

@@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from "vue"; import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { useGlobal } from "@pureadmin/utils"; import { useGlobal } from "@pureadmin/utils";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
@@ -9,10 +10,11 @@ interface Props {
isActive: boolean; isActive: boolean;
} }
const props = withDefaults(defineProps<Props>(), { withDefaults(defineProps<Props>(), {
isActive: false isActive: false
}); });
const { t } = useI18n();
const { tooltipEffect } = useNav(); const { tooltipEffect } = useNav();
const iconClass = computed(() => { const iconClass = computed(() => {
@@ -44,14 +46,16 @@ const toggleClick = () => {
<div class="left-collapse"> <div class="left-collapse">
<IconifyIconOffline <IconifyIconOffline
v-tippy="{ v-tippy="{
content: props.isActive ? '点击折叠' : '点击展开', content: isActive
? t('buttons.pureClickCollapse')
: t('buttons.pureClickExpand'),
theme: tooltipEffect, theme: tooltipEffect,
hideOnClick: 'toggle', hideOnClick: 'toggle',
placement: 'right' placement: 'right'
}" }"
:icon="MenuFold" :icon="MenuFold"
:class="[iconClass, themeColor === 'light' ? '' : 'text-primary']" :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
:style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }" :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
@click="toggleClick" @click="toggleClick"
/> />
</div> </div>

View File

@@ -3,10 +3,6 @@ import { computed } from "vue";
import { isUrl } from "@pureadmin/utils"; import { isUrl } from "@pureadmin/utils";
import { menuType } from "@/layout/types"; import { menuType } from "@/layout/types";
defineOptions({
name: "LinkItem"
});
const props = defineProps<{ const props = defineProps<{
to: menuType; to: menuType;
}>(); }>();

View File

@@ -2,7 +2,7 @@
import { getTopMenu } from "@/router/utils"; import { getTopMenu } from "@/router/utils";
import { useNav } from "@/layout/hooks/useNav"; import { useNav } from "@/layout/hooks/useNav";
const props = defineProps({ defineProps({
collapse: Boolean collapse: Boolean
}); });
@@ -10,11 +10,11 @@ const { title, getLogo } = useNav();
</script> </script>
<template> <template>
<div class="sidebar-logo-container" :class="{ collapses: props.collapse }"> <div class="sidebar-logo-container" :class="{ collapses: collapse }">
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link <router-link
v-if="props.collapse" v-if="collapse"
key="props.collapse" key="collapse"
:title="title" :title="title"
class="sidebar-logo-link" class="sidebar-logo-link"
:to="getTopMenu()?.path ?? '/'" :to="getTopMenu()?.path ?? '/'"

View File

@@ -1,4 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { useI18n } from "vue-i18n";
import MenuFold from "@iconify-icons/ri/menu-fold-fill"; import MenuFold from "@iconify-icons/ri/menu-fold-fill";
import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill"; import MenuUnfold from "@iconify-icons/ri/menu-unfold-fill";
@@ -6,10 +7,12 @@ interface Props {
isActive: boolean; isActive: boolean;
} }
const props = withDefaults(defineProps<Props>(), { withDefaults(defineProps<Props>(), {
isActive: false isActive: false
}); });
const { t } = useI18n();
const emit = defineEmits<{ const emit = defineEmits<{
(e: "toggleClick"): void; (e: "toggleClick"): void;
}>(); }>();
@@ -22,11 +25,13 @@ const toggleClick = () => {
<template> <template>
<div <div
class="px-3 mr-1 navbar-bg-hover" class="px-3 mr-1 navbar-bg-hover"
:title="props.isActive ? '点击折叠' : '点击展开'" :title="
isActive ? t('buttons.pureClickCollapse') : t('buttons.pureClickExpand')
"
@click="toggleClick" @click="toggleClick"
> >
<IconifyIconOffline <IconifyIconOffline
:icon="props.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>

View File

@@ -0,0 +1,33 @@
<template>
<svg class="w-full h-full">
<defs>
<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" />
</symbol>
<symbol id="geometry-right" viewBox="0 0 214 36">
<use xlink:href="#geometry-left" />
</symbol>
<clipPath>
<rect width="100%" height="100%" x="0" />
</clipPath>
</defs>
<svg width="51%" height="100%">
<use
xlink:href="#geometry-left"
width="214"
height="36"
fill="currentColor"
/>
</svg>
<g transform="scale(-1, 1)">
<svg width="51%" height="100%" x="-100%" y="0">
<use
xlink:href="#geometry-right"
width="214"
height="36"
fill="currentColor"
/>
</svg>
</g>
</svg>
</template>

View File

@@ -41,6 +41,13 @@
padding-right: 24px; padding-right: 24px;
} }
&.chrome-item {
padding-right: 0;
padding-left: 0;
margin-right: -18px;
box-shadow: none;
}
.el-icon-close { .el-icon-close {
position: absolute; position: absolute;
top: 50%; top: 50%;
@@ -76,6 +83,14 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
&.chrome-scroll-container {
padding-top: 4px;
.fixed-tag {
padding: 0 !important;
}
}
.tab { .tab {
position: relative; position: relative;
float: left; float: left;
@@ -89,6 +104,16 @@
&:nth-child(1) { &:nth-child(1) {
padding: 0 12px; padding: 0 12px;
} }
&.chrome-item {
&:nth-child(1) {
padding: 0;
}
}
}
.fixed-tag {
padding: 0 12px;
} }
} }
} }
@@ -169,9 +194,29 @@
color: #fff; color: #fff;
box-shadow: 0 0 0.7px #888; box-shadow: 0 0 0.7px #888;
.chrome-tab {
z-index: 10;
}
.chrome-tab__bg {
color: var(--el-color-primary-light-9) !important;
}
.tag-title { .tag-title {
color: var(--el-color-primary) !important; color: var(--el-color-primary) !important;
} }
.chrome-close-btn {
color: var(--el-color-primary);
&:hover {
background-color: var(--el-color-primary);
}
}
.chrome-tab-divider {
opacity: 0;
}
} }
.arrow-left, .arrow-left,
@@ -258,3 +303,69 @@
background: var(--el-color-primary); background: var(--el-color-primary);
animation: schedule-out-width 200ms ease-in; animation: schedule-out-width 200ms ease-in;
} }
/* 谷歌风格的页签 */
.chrome-tab {
position: relative;
display: inline-flex;
gap: 16px;
align-items: center;
justify-content: center;
padding: 0 24px;
white-space: nowrap;
cursor: pointer;
.tag-title {
padding: 0;
}
.chrome-tab-divider {
position: absolute;
right: 7px;
width: 1px;
height: 14px;
background-color: #2b2d2f;
}
&:hover {
z-index: 10;
.chrome-tab__bg {
color: #dee1e6;
}
.tag-title {
color: #1f1f1f;
}
.chrome-tab-divider {
opacity: 0;
}
}
.chrome-tab__bg {
position: absolute;
top: 0;
left: 0;
z-index: -10;
width: 100%;
height: 100%;
color: transparent;
pointer-events: none;
}
.chrome-close-btn {
display: inline-flex;
align-items: center;
justify-content: center;
width: 16px;
height: 16px;
color: #666;
border-radius: 50%;
&:hover {
color: white;
background-color: #b1b3b8;
}
}
}

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