diff --git a/apps/web-antd/src/router/routes/modules/person.ts b/apps/web-antd/src/router/routes/modules/person.ts index d20d237..234e02e 100644 --- a/apps/web-antd/src/router/routes/modules/person.ts +++ b/apps/web-antd/src/router/routes/modules/person.ts @@ -11,7 +11,7 @@ const routes: RouteRecordRaw[] = [ icon: MaterPerson, title: '个人', order: 5, - authority: ['dashboard'], + authority: ['user'], }, }, ]; diff --git a/apps/web-antd/src/router/routes/modules/system.ts b/apps/web-antd/src/router/routes/modules/system.ts index f9a8f33..2916096 100644 --- a/apps/web-antd/src/router/routes/modules/system.ts +++ b/apps/web-antd/src/router/routes/modules/system.ts @@ -57,7 +57,7 @@ const routes: RouteRecordRaw[] = [ meta: { icon: IconLog, title: '系统日志', - authority: ['system'], + authority: ['system:operationLog'], }, }, { @@ -67,7 +67,7 @@ const routes: RouteRecordRaw[] = [ meta: { icon: FluentWorkflow, title: '工作流管理', - authority: ['system'], + authority: ['system:workflow'], }, }, ], diff --git a/apps/web-antd/src/views/dept/data.ts b/apps/web-antd/src/views/dept/data.ts index b35f469..9fd37b7 100644 --- a/apps/web-antd/src/views/dept/data.ts +++ b/apps/web-antd/src/views/dept/data.ts @@ -151,14 +151,20 @@ export function useColumns( { code: 'append', text: '新增下级', + permission: 'system:dept:create', }, // { // code: 'auth', // text: '工作流', // }, - 'edit', // 默认的编辑按钮 + { + code: 'edit', + text: '修改', + permission: 'system:dept:update', + }, { code: 'delete', // 默认的删除按钮 + permission: 'system:dept:delete', disabled: (row: DeptApi.Dept) => { return !!(row.children && row.children.length > 0); }, diff --git a/apps/web-antd/src/views/log/list.vue b/apps/web-antd/src/views/log/list.vue index 32faae9..f82a942 100644 --- a/apps/web-antd/src/views/log/list.vue +++ b/apps/web-antd/src/views/log/list.vue @@ -80,7 +80,14 @@ async function onDelete() { <FormDrawer /> <Grid table-title="用户列表"> <template #toolbar-tools> - <Button type="primary" @click="onDelete" danger> 批量删除 </Button> + <Button + type="primary" + @click="onDelete" + danger + v-access:code="'system:log:delete'" + > + 批量删除 + </Button> </template> <template #makeTime="{ row }"> {{ dayjs(row.makeTime).format('YYYY-MM-DD HH:mm') }} diff --git a/apps/web-antd/src/views/role/data.ts b/apps/web-antd/src/views/role/data.ts index a692cc8..1a0b92e 100644 --- a/apps/web-antd/src/views/role/data.ts +++ b/apps/web-antd/src/views/role/data.ts @@ -120,6 +120,18 @@ export function useColumns<T = RoleApi.Role>( nameField: 'name', nameTitle: '角色', onClick: onActionClick, + options: [ + { + code: 'edit', + text: '编辑', + permission: 'system:role:update', + }, + { + code: 'delete', + text: '删除', + permission: 'system:role:delete', + }, + ], }, name: 'CellOperation', }, diff --git a/apps/web-antd/src/views/role/list.vue b/apps/web-antd/src/views/role/list.vue index 1959c57..b4ce14b 100644 --- a/apps/web-antd/src/views/role/list.vue +++ b/apps/web-antd/src/views/role/list.vue @@ -155,7 +155,11 @@ function onCreate() { <FormDrawer /> <Grid table-title="角色列表"> <template #toolbar-tools> - <Button type="primary" @click="onCreate"> + <Button + type="primary" + @click="onCreate" + v-access:code="'system:role:create'" + > <Plus class="size-5" /> {{ $t('ui.actionTitle.create', ['角色']) }} </Button> diff --git a/apps/web-antd/src/views/user/data.ts b/apps/web-antd/src/views/user/data.ts index 64743df..841d166 100644 --- a/apps/web-antd/src/views/user/data.ts +++ b/apps/web-antd/src/views/user/data.ts @@ -191,14 +191,17 @@ export function useColumns<T = UserApi.User>( { code: 'resetPassword', text: '重置密码', + permission: 'system:user:update', }, { code: 'edit', text: '修改', + permission: 'system:user:update', }, { code: 'delete', text: '删除', + permission: 'system:user:delete', }, ], name: 'CellOperation', diff --git a/apps/web-antd/src/views/user/list.vue b/apps/web-antd/src/views/user/list.vue index 7376eb0..9419c8b 100644 --- a/apps/web-antd/src/views/user/list.vue +++ b/apps/web-antd/src/views/user/list.vue @@ -170,7 +170,11 @@ function onCreate() { <FormDrawer @success="onRefresh" /> <Grid table-title="用户列表"> <template #toolbar-tools> - <Button type="primary" @click="onCreate"> + <Button + type="primary" + @click="onCreate" + v-access:code="'system:user:create'" + > <Plus class="size-5" /> {{ $t('ui.actionTitle.create', ['用户']) }} </Button> diff --git a/apps/web-antd/src/views/workflow/data.ts b/apps/web-antd/src/views/workflow/data.ts index ed39453..11835c7 100644 --- a/apps/web-antd/src/views/workflow/data.ts +++ b/apps/web-antd/src/views/workflow/data.ts @@ -67,7 +67,11 @@ export function useColumns( onClick: onActionClick, }, options: [ - 'edit', // 默认的编辑按钮 + { + code: 'update', + text: '关联部门', + permission: 'workflow:update', + }, ], }, field: 'operation', diff --git a/packages/constants/src/core.ts b/packages/constants/src/core.ts index 24db39d..b9f2eb8 100644 --- a/packages/constants/src/core.ts +++ b/packages/constants/src/core.ts @@ -6,7 +6,7 @@ export const LOGIN_PATH = '/auth/login'; /** * @zh_CN 默认首页地址 */ -export const DEFAULT_HOME_PATH = '/analytics'; +export const DEFAULT_HOME_PATH = '/home'; export interface LanguageOption { label: string;