Skip to content

Commit daa31f7

Browse files
anncwbanncwb
committed
refactor(project): simplified part of the package, code optimization
1 parent 5784d71 commit daa31f7

File tree

92 files changed

+318
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+318
-546
lines changed

‎apps/backend-mock/src/modules/menu/menu.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class MenuController {
9696
path: 'access',
9797
meta: {
9898
icon: 'mdi:cloud-key-outline',
99-
title: 'page.demos.access.backendControl',
99+
title: 'page.demos.access.backendPermissions',
100100
},
101101
redirect: '/demos/access/page-control',
102102
children: [

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import type { GeneratorMenuAndRoutesOptions } from '@vben/access';
2-
import type { ComponentRecordType } from '@vben/types';
1+
import type {
2+
ComponentRecordType,
3+
GenerateMenuAndRoutesOptions,
4+
} from '@vben/types';
35

4-
import { generateMenusAndRoutes } from '@vben/access';
6+
import { generateAccessible } from '@vben/access';
57
import { preferences } from '@vben-core/preferences';
68

79
import { message } from 'ant-design-vue';
@@ -13,15 +15,15 @@ import { $t } from '#/locales';
1315
const forbiddenComponent = () =>
1416
import('#/views/_essential/fallback/forbidden.vue');
1517

16-
async function generateAccess(options: GeneratorMenuAndRoutesOptions) {
18+
async function generateAccess(options: GenerateMenuAndRoutesOptions) {
1719
const pageMap: ComponentRecordType = import.meta.glob('../views/**/*.vue');
1820

1921
const layoutMap: ComponentRecordType = {
2022
BasicLayout,
2123
IFrameView,
2224
};
2325

24-
return await generateMenusAndRoutes(preferences.app.accessMode, {
26+
return await generateAccessible(preferences.app.accessMode, {
2527
...options,
2628
fetchMenuListAsync: async () => {
2729
message.loading({

‎apps/web-antd/src/locales/langs/en-US.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"demos": {
44
"title": "Demos",
55
"access": {
6-
"frontendControl": "Frontend Control",
7-
"backendControl": "Backend Control",
6+
"frontendPermissions": "Frontend Permissions",
7+
"backendPermissions": "Backend Permissions",
88
"pageAccess": "Page Access",
99
"buttonControl": "Button Control",
1010
"menuVisible403": "Menu Visible(403)",

‎apps/web-antd/src/locales/langs/zh-CN.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"demos": {
44
"title": "演示",
55
"access": {
6-
"frontendControl": "前端控制",
7-
"backendControl": "后端控制",
6+
"frontendPermissions": "前端权限",
7+
"backendPermissions": "后端权限",
88
"pageAccess": "页面访问",
99
"buttonControl": "按钮控制",
1010
"menuVisible403": "菜单可见(403)",

‎apps/web-antd/src/router/routes/modules/demos.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const routes: RouteRecordRaw[] = [
1919
{
2020
meta: {
2121
icon: 'mdi:shield-key-outline',
22-
title: $t('page.demos.access.frontendControl'),
22+
title: $t('page.demos.access.frontendPermissions'),
2323
},
2424
name: 'Access',
2525
path: 'access',

‎apps/web-antd/src/views/dashboard/analytics/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts" setup>
2-
import type { TabsItem } from '@vben/types';
2+
import type { TabsOption } from '@vben/types';
33
import type { AnalysisOverviewItem } from '@vben/universal-ui';
44
55
import {
@@ -53,7 +53,7 @@ const overviewItems: AnalysisOverviewItem[] = [
5353
},
5454
];
5555
56-
const chartTabs: TabsItem[] = [
56+
const chartTabs: TabsOption[] = [
5757
{
5858
label: '流量趋势',
5959
value: 'trends',

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

Lines changed: 32 additions & 13 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 { CodeAccess, useAccess } from '@vben/access';
6+
import { AccessControl, useAccess } from '@vben/access';
77
88
import { Button } from 'ant-design-vue';
99
@@ -59,9 +59,9 @@ async function changeAccount(role: string) {
5959

6060
<div class="card-box mt-5 p-5 font-semibold">
6161
<div class="mb-3">
62-
<span class="text-lg">当前账号:</span>
63-
<span class="text-primary mx-4">
64-
{{ accessStore.userRoles }}
62+
<span class="text-lg">当前角色:</span>
63+
<span class="text-primary mx-4 text-lg">
64+
{{ accessStore.userRoles?.[0] }}
6565
</span>
6666
</div>
6767

@@ -82,21 +82,40 @@ async function changeAccount(role: string) {
8282
</div>
8383

8484
<div class="card-box mt-5 p-5 font-semibold">
85-
<div class="mb-3 text-lg">组件形式控制</div>
86-
<CodeAccess :value="['AC_100100']">
85+
<div class="mb-3 text-lg">组件形式控制 - 权限码方式</div>
86+
<AccessControl :value="['AC_100100']" type="code">
8787
<Button class="mr-4"> Super 账号可见 ["AC_1000001"] </Button>
88-
</CodeAccess>
89-
<CodeAccess :value="['AC_100030']">
88+
</AccessControl>
89+
<AccessControl :value="['AC_100030']" type="code">
9090
<Button class="mr-4"> Admin 账号可见 ["AC_100010"] </Button>
91-
</CodeAccess>
92-
<CodeAccess :value="['AC_1000001']">
91+
</AccessControl>
92+
<AccessControl :value="['AC_1000001']" type="code">
9393
<Button class="mr-4"> User 账号可见 ["AC_1000001"] </Button>
94-
</CodeAccess>
95-
<CodeAccess :value="['AC_100100', 'AC_100010']">
94+
</AccessControl>
95+
<AccessControl :value="['AC_100100', 'AC_100010']" type="code">
9696
<Button class="mr-4">
9797
Super & Admin 账号可见 ["AC_100100","AC_1000001"]
9898
</Button>
99-
</CodeAccess>
99+
</AccessControl>
100+
</div>
101+
102+
<div
103+
v-if="accessMode === 'frontend'"
104+
class="card-box mt-5 p-5 font-semibold"
105+
>
106+
<div class="mb-3 text-lg">组件形式控制 - 用户角色方式</div>
107+
<AccessControl :value="['super']">
108+
<Button class="mr-4"> Super 角色可见 </Button>
109+
</AccessControl>
110+
<AccessControl :value="['admin']">
111+
<Button class="mr-4"> Admin 角色可见 </Button>
112+
</AccessControl>
113+
<AccessControl :value="['user']">
114+
<Button class="mr-4"> User 角色可见 </Button>
115+
</AccessControl>
116+
<AccessControl :value="['super', 'admin']">
117+
<Button class="mr-4"> Super & Admin 角色可见 </Button>
118+
</AccessControl>
100119
</div>
101120

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

‎apps/web-antd/src/views/demos/access/index.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,18 @@ async function handleToggleAccessMode() {
6969

7070
<div class="card-box mt-5 p-5 font-semibold">
7171
<span class="text-lg">当前权限模式:</span>
72-
<span class="text-primary mx-4">{{ accessMode }}</span>
72+
<span class="text-primary mx-4">{{
73+
accessMode === 'frontend' ? '前端权限控制' : '后端权限控制'
74+
}}</span>
7375
<Button type="primary" @click="handleToggleAccessMode">
7476
切换为{{ accessMode === 'frontend' ? '后端' : '前端' }}权限模式
7577
</Button>
7678
</div>
7779
<div class="card-box mt-5 p-5 font-semibold">
7880
<div class="mb-3">
7981
<span class="text-lg">当前账号:</span>
80-
<span class="text-primary mx-4">
81-
{{ accessStore.userRoles }}
82+
<span class="text-primary mx-4 text-lg">
83+
{{ accessStore.userRoles?.[0] }}
8284
</span>
8385
</div>
8486

‎apps/web-antd/src/views/demos/features/login-expired/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts" setup>
2-
import type { LoginExpiredModeType } from '@vben-core/preferences';
2+
import type { LoginExpiredModeType } from '@vben/types';
33
44
import { preferences, updatePreferences } from '@vben-core/preferences';
55

‎package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@
8888
"clsx": "^2.1.1",
8989
"vue": "^3.4.31"
9090
},
91-
"peerDependencyRules": {
92-
"allowedVersions": {
93-
"eslint": "*",
94-
" @typescript-eslint/eslint-plugin": "*"
95-
}
96-
},
9791
"neverBuiltDependencies": [
9892
"canvas",
9993
"node-gyp",

0 commit comments

Comments
 (0)