Skip to content

Commit a765d3b

Browse files
committed
feat: new interface pendant can be configured to display hidden
1 parent db76325 commit a765d3b

File tree

36 files changed

+256
-612
lines changed

36 files changed

+256
-612
lines changed

apps/backend-mock/README.md

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

33
## Description
44

5-
Vben Admin Pro 数据mock服务
5+
Vben Admin Pro 数据 mock 服务,没有对接任何的数据库,所有数据都是模拟的,用于前端开发时提供数据支持。由于 sqlite 安装需要在本地进行编译,所以这里接口是直接返回的。线上环境不再提供mock集成,可自行部署服务或者对接真实数据,同步 mock.js等工具有一些限制,比如上传文件不行、无法模拟复杂的逻辑等,所以这里使用了 真是的后端服务来实现。唯一麻烦的是本地需要同时启动后端服务和前端服务,但是这样可以更好的模拟真实环境。
66

77
## Running the app
88

apps/web-antd/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
name="viewport"
1212
content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
1313
/>
14-
<!-- 由 vite 注入 VITE_GLOB_APP_TITLE 变量,在 . env 内配置 -->
14+
<!-- 由 vite 注入 VITE_GLOB_APP_TITLE 变量,在 .env 文件内配置 -->
1515
<title><%= VITE_GLOB_APP_TITLE %></title>
1616
<link rel="icon" href="/favicon.ico" />
1717
</head>

apps/web-antd/src/forward/access.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import { getAllMenus } from '#/apis';
1010
import { BasicLayout, IFrameView } from '#/layouts';
1111
import { $t } from '#/locales';
1212

13-
const forbiddenPage = () => import('#/views/_essential/fallback/forbidden.vue');
13+
const forbiddenComponent = () =>
14+
import('#/views/_essential/fallback/forbidden.vue');
1415

1516
async function generateAccess(options: GeneratorMenuAndRoutesOptions) {
1617
const pageMap: ComponentRecordType = import.meta.glob('../views/**/*.vue');
@@ -30,7 +31,7 @@ async function generateAccess(options: GeneratorMenuAndRoutesOptions) {
3031
return await getAllMenus();
3132
},
3233
// 可以指定没有权限跳转403页面
33-
forbiddenComponent: forbiddenPage,
34+
forbiddenComponent,
3435
// 如果 route.meta.menuVisibleWithForbidden = true
3536
layoutMap,
3637
pageMap,

apps/web-antd/src/locales/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import dayjs from 'dayjs';
1010

1111
const antdLocale = ref<Locale>(defaultLocale);
1212

13-
const modules = import.meta.glob('./langs/*.y(a)?ml');
13+
const modules = import.meta.glob('./langs/*.json');
1414

1515
const localesMap = loadLocalesMap(modules);
1616

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"page": {
3+
"demos": {
4+
"title": "Demos",
5+
"access": {
6+
"title": "Access Control",
7+
"frontend-control": "Front-end Control",
8+
"backend-control": "Backend Control",
9+
"page": "Page visit",
10+
"button": "Button control",
11+
"loading-menu": "In the loading menu",
12+
"access-test-1": "Super visit",
13+
"access-test-2": "Admin visit",
14+
"access-test-3": "User visit"
15+
},
16+
"nested": {
17+
"title": "Nested Menu",
18+
"menu1": "Menu 1",
19+
"menu2": "Menu 2",
20+
"menu21": "Menu 2-1",
21+
"menu3": "Menu 3",
22+
"menu31": "Menu 3-1",
23+
"menu32": "Menu 3-2",
24+
"menu321": "Menu 3-2-1"
25+
},
26+
"outside": {
27+
"title": "External Page",
28+
"embedded": "embedded Page",
29+
"external-link": "External Link"
30+
},
31+
"fallback": { "title": "Fallback Page" }
32+
}
33+
}
34+
}

apps/web-antd/src/locales/langs/en-US.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"page": {
3+
"demos": {
4+
"title": "演示",
5+
"access": {
6+
"title": "访问控制",
7+
"frontend-control": "前端控制",
8+
"backend-control": "后端控制",
9+
"page": "页面访问",
10+
"button": "按钮控制",
11+
"access-test-1": "Super 可见",
12+
"access-test-2": "Admin 可见",
13+
"access-test-3": "User 可见"
14+
},
15+
"nested": {
16+
"title": "嵌套菜单",
17+
"menu1": "菜单 1",
18+
"menu2": "菜单 2",
19+
"menu21": "菜单 2-1",
20+
"menu3": "菜单 3",
21+
"menu31": "菜单 3-1",
22+
"menu32": "菜单 3-2",
23+
"menu321": "菜单 3-2-1"
24+
},
25+
"outside": {
26+
"title": "外部页面",
27+
"embedded": "内嵌",
28+
"external-link": "外链"
29+
},
30+
"fallback": {
31+
"title": "缺省页"
32+
}
33+
}
34+
}
35+
}

apps/web-antd/src/locales/langs/zh-CN.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

apps/web-antd/src/preferences.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import type { DeepPartial } from '@vben/types';
2-
import type { Preferences } from '@vben-core/preferences';
1+
import { defineOverridesPreferences } from '@vben-core/preferences';
32

43
/**
54
* @description 项目配置文件
65
* 只需要覆盖项目中的一部分配置,不需要的配置不用覆盖,会自动使用默认配置
76
*/
8-
export const overridesPreferences: DeepPartial<Preferences> = {};
7+
export const overridesPreferences = defineOverridesPreferences({
8+
// overrides
9+
});

apps/web-antd/src/views/demos/access/backend/button-control.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { LoginAndRegisterParams } from '@vben/universal-ui';
33
44
import { useRouter } from 'vue-router';
55
6-
import { CodeAuthority, useAccess } from '@vben/access';
6+
import { CodeAccess, useAccess } from '@vben/access';
77
88
import { Button } from 'ant-design-vue';
99
@@ -82,20 +82,20 @@ async function changeAccount(role: string) {
8282

8383
<div class="card-box mt-5 p-5 font-semibold">
8484
<div class="mb-3 text-lg">组件形式控制</div>
85-
<CodeAuthority :value="['AC_100100']">
85+
<CodeAccess :value="['AC_100100']">
8686
<Button class="mr-4"> Super 账号可见 ["AC_1000001"] </Button>
87-
</CodeAuthority>
88-
<CodeAuthority :value="['AC_100030']">
87+
</CodeAccess>
88+
<CodeAccess :value="['AC_100030']">
8989
<Button class="mr-4"> Admin 账号可见 ["AC_100010"] </Button>
90-
</CodeAuthority>
91-
<CodeAuthority :value="['AC_1000001']">
90+
</CodeAccess>
91+
<CodeAccess :value="['AC_1000001']">
9292
<Button class="mr-4"> User 账号可见 ["AC_1000001"] </Button>
93-
</CodeAuthority>
94-
<CodeAuthority :value="['AC_100100', 'AC_100010']">
93+
</CodeAccess>
94+
<CodeAccess :value="['AC_100100', 'AC_100010']">
9595
<Button class="mr-4">
9696
Super & Admin 账号可见 ["AC_100100","AC_1000001"]
9797
</Button>
98-
</CodeAuthority>
98+
</CodeAccess>
9999
</div>
100100

101101
<div class="card-box mt-5 p-5 font-semibold">

0 commit comments

Comments
 (0)