Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update role data range logic #98

Merged
merged 2 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions src/api/data-rule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import axios from 'axios';
import qs from 'query-string';

export interface SysDataRuleReq {
name: string;
model: string;
column: string;
operator: number;
expression: number;
value: string;
}

export interface SysDataRuleRes extends SysDataRuleReq {
id: number;
}

export interface SysDataRuleParams {
name?: string;
page?: number;
size?: number;
}

export interface SysDataRuleListRes {
items: SysDataRuleRes[];
total: number;
}

export interface SysDataRuleDeleteParams {
pk: number[];
}

export function querySysDataRuleModels(): Promise<string[]> {
return axios.get('/api/v1/sys/data-rules/models');
}

export function querySysDataRuleColumns(model: string): Promise<string[]> {
return axios.get(`/api/v1/sys/data-rules/model/${model}/columns`);
}

export function querySysDataRuleAll(): Promise<SysDataRuleRes[]> {
return axios.get('/api/v1/sys/data-rules/all');
}

export function querySysDataRuleDetail(pk: number): Promise<SysDataRuleRes> {
return axios.get(`/api/v1/sys/data-rules/${pk}`);
}

export function querySysDataRuleList(
params: SysDataRuleParams
): Promise<SysDataRuleListRes> {
return axios.get('/api/v1/sys/data-rules', {
params,
paramsSerializer: (obj) => {
return qs.stringify(obj);
},
});
}

export function createSysDataRule(data: SysDataRuleReq) {
return axios.post('/api/v1/sys/data-rules', data);
}

export function updateSysDataRule(pk: number, data: SysDataRuleReq) {
return axios.put(`/api/v1/sys/data-rules/${pk}`, data);
}

export function deleteSysDataRule(params: SysDataRuleDeleteParams) {
return axios.delete('/api/v1/sys/data-rules', {
params,
paramsSerializer: (obj) => {
return qs.stringify(obj);
},
});
}
12 changes: 12 additions & 0 deletions src/api/role.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ export interface SysRoleMenuReq {
menus: number[];
}

export interface SysRoleDataRuleReq {
rules: number[];
}

export interface SysRoleRes {
id: number;
name: string;
Expand Down Expand Up @@ -53,6 +57,10 @@ export function querySysMenuTreeBySysRole(
return axios.get(`/api/v1/sys/roles/${pk}/menus`);
}

export function querySysRoleRuleBySysRole(pk: number): Promise<number[]> {
return axios.get(`/api/v1/sys/roles/${pk}/rules`);
}

export function querySysRoleList(
params: SysRoleParams
): Promise<SysRoleListRes> {
Expand Down Expand Up @@ -88,3 +96,7 @@ export function deleteSysRole(params: SysRoleDeleteParams) {
export function updateSysRoleMenu(pk: number, data: SysRoleMenuReq) {
return axios.put(`/api/v1/sys/roles/${pk}/menu`, data);
}

export function updateSysRoleDataRule(pk: number, data: SysRoleDataRuleReq) {
return axios.put(`/api/v1/sys/roles/${pk}/rule`, data);
}
6 changes: 4 additions & 2 deletions src/locale/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ import localeSysApi from '@/views/admin/api/locale/en-US';
import localeSysUser from '@/views/admin/user/locale/en-US';
import localeSysRole from '@/views/admin/role/locale/en-US';
import localeGenerator from '@/views/automation/code-generator/local/en-US';
import localeDataRule from '@/views/admin/data-rule/local/en-US';
import localeSettings from './en-US/settings';

export default {
'menu.dashboard': 'Dashboard',
'menu.admin': 'System Manage',
'menu.automation': 'System Automation',
'menu.log': 'Log',
'menu.monitor': 'System Monitor',
'menu.log': 'Log',
'menu.arcoWebsite': 'Arco Design',
'menu.faq': 'FAQ',
'menu.site': ' Official Website',
'menu.github': 'GitHub',
'menu.sponsor': 'Sponsor',
'navbar.action.locale': 'Switch to English',
Expand All @@ -47,4 +48,5 @@ export default {
...localeSysUser,
...localeSysRole,
...localeGenerator,
...localeDataRule,
};
6 changes: 4 additions & 2 deletions src/locale/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ import localeRedisMonitor from '@/views/monitor/redis/locale/zh-CN';
import localeSysUser from '@/views/admin/user/locale/zh-CN';
import localeSysRole from '@/views/admin/role/locale/zh-CN';
import localeGenerator from '@/views/automation/code-generator/local/zh-CN';
import localeDataRule from '@/views/admin/data-rule/local/zh-CN';
import localeSettings from './zh-CN/settings';

export default {
'menu.dashboard': '仪表盘',
'menu.admin': '系统管理',
'menu.automation': '系统自动化',
'menu.log': '日志',
'menu.monitor': '系统监控',
'menu.log': '日志',
'menu.arcoWebsite': 'Arco Design',
'menu.faq': '常见问题',
'menu.site': '官网',
'menu.github': 'GitHub',
'menu.sponsor': '赞助',
'navbar.action.locale': '切换为中文',
Expand All @@ -47,4 +48,5 @@ export default {
...localeSysUser,
...localeSysRole,
...localeGenerator,
...localeDataRule,
};
30 changes: 20 additions & 10 deletions src/router/routes/modules/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,6 @@ const SYSTEM: AppRouteRecordRaw = {
roles: ['*'],
},
},
{
path: 'sys-api',
name: 'SysApi',
component: () => import('@/views/admin/api/index.vue'),
meta: {
locale: 'menu.admin.sysApi',
requiresAuth: true,
roles: ['*'],
},
},
{
path: 'sys-role',
name: 'SysRole',
Expand All @@ -62,6 +52,26 @@ const SYSTEM: AppRouteRecordRaw = {
roles: ['*'],
},
},
{
path: 'sys-api',
name: 'SysApi',
component: () => import('@/views/admin/api/index.vue'),
meta: {
locale: 'menu.admin.sysApi',
requiresAuth: true,
roles: ['*'],
},
},
{
path: 'sys-data-rule',
name: 'SysDataRule',
component: () => import('@/views/admin/data-rule/index.vue'),
meta: {
locale: 'menu.admin.sysDataRule',
requiresAuth: true,
roles: ['*'],
},
},
],
};

Expand Down
5 changes: 4 additions & 1 deletion src/views/admin/api/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
{{ $t('admin.api.button.delete') }}
</a-button>
</a-space>
<a-alert type="warning" style="margin-top: 20px">
{{ $t('admin.api.alert') }}
</a-alert>
<div class="content">
<a-table
v-model:selected-keys="rowSelectKeys"
Expand Down Expand Up @@ -199,7 +202,7 @@
</a-modal>
<a-modal
:closable="false"
:title="`${$t('modal.title.tips')}`"
:title="$t('modal.title.tips')"
:visible="openDelete"
:width="360"
@cancel="cancelReq"
Expand Down
2 changes: 2 additions & 0 deletions src/views/admin/api/locale/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ export default {
'admin.api.columns.method': 'Method',
'admin.api.columns.remark': 'Remark',
'admin.api.columns.operate': 'Operate',
// alert
'admin.api.alert': 'This configuration is only used for Casbin permissions',
};
2 changes: 2 additions & 0 deletions src/views/admin/api/locale/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ export default {
'admin.api.columns.method': '请求方式',
'admin.api.columns.remark': '备注',
'admin.api.columns.operate': '操作',
// alert
'admin.api.alert': '此配置仅用于 Casbin 权限',
};
Loading