+
)}
diff --git a/src/pages/Permissions/components/PendingRequests.jsx b/src/pages/Permissions/components/PendingRequests.jsx
index 47d5347..af9377f 100644
--- a/src/pages/Permissions/components/PendingRequests.jsx
+++ b/src/pages/Permissions/components/PendingRequests.jsx
@@ -24,7 +24,7 @@ export default function PendingRequests() {
// 从Redux store获取权限申请列表状态
const {
- results: pendingRequests,
+ results: permissionRequests,
status: fetchStatus,
error: fetchError,
page: currentPage,
@@ -185,32 +185,69 @@ export default function PendingRequests() {
);
};
+ // 根据状态渲染不同的状态标签
+ const renderStatusBadge = (status) => {
+ switch (status) {
+ case 'approved':
+ return (
+
+
+ 已批准
+
+ );
+ case 'rejected':
+ return (
+
+
+ 已拒绝
+
+ );
+ case 'pending':
+ return (
+
+ 待处理
+
+ );
+ default:
+ return null;
+ }
+ };
+
// 渲染加载状态
- if (fetchStatus === 'loading' && pendingRequests.length === 0) {
+ if (fetchStatus === 'loading' && permissionRequests.length === 0) {
return (
加载中...
-
加载待处理申请...
+
加载权限申请...
);
}
// 渲染错误状态
- if (fetchStatus === 'failed' && pendingRequests.length === 0) {
+ if (fetchStatus === 'failed' && permissionRequests.length === 0) {
return (
- {fetchError || '获取待处理申请失败'}
+ {fetchError || '获取权限申请失败'}
);
}
// 渲染空状态
- if (pendingRequests.length === 0) {
+ if (permissionRequests.length === 0) {
return (
- 暂无待处理的权限申请
+ 暂无权限申请记录
);
}
@@ -219,12 +256,14 @@ export default function PendingRequests() {
return (
<>
-
待处理申请
-
{total}个待处理
+
权限申请列表
+
+ {permissionRequests.filter((req) => req.status === 'pending').length}个待处理
+
- {pendingRequests.map((request) => (
+ {permissionRequests.map((request) => (
handleRowClick(request)}>
@@ -235,7 +274,10 @@ export default function PendingRequests() {
-
申请访问：{request.knowledge_base.name}
+
+
申请访问：{request.knowledge_base.name}
+ {renderStatusBadge(request.status)}
+
{request.permissions.can_edit ? (
)}
+
+ {request.response_message && (
+
+ 审批意见: {request.response_message}
+
+ )}
-
-
+ {request.status === 'pending' ? (
+ <>
+
+
+
+ ) : (
+
+ {request.status === 'approved' ? '已批准' : '已拒绝'}
+ {request.updated_at && (
+
+ {new Date(request.updated_at).toLocaleDateString()}
+
+ )}
+
+ )}
))}
diff --git a/src/pages/Permissions/components/UserPermissions.jsx b/src/pages/Permissions/components/UserPermissions.jsx
index 801226c..42dad52 100644
--- a/src/pages/Permissions/components/UserPermissions.jsx
+++ b/src/pages/Permissions/components/UserPermissions.jsx
@@ -13,6 +13,7 @@ export default function UserPermissions() {
const [selectedUser, setSelectedUser] = useState(null);
const [showDetailsModal, setShowDetailsModal] = useState(false);
const [searchTerm, setSearchTerm] = useState('');
+ const [statusFilter, setStatusFilter] = useState('all'); // 'all', 'pending', 'approved', 'rejected'
// 分页状态
const [currentPage, setCurrentPage] = useState(1);
@@ -62,6 +63,11 @@ export default function UserPermissions() {
setCurrentPage(1); // 重置到第一页
};
+ const handleStatusFilterChange = (e) => {
+ setStatusFilter(e.target.value);
+ setCurrentPage(1); // 重置到第一页
+ };
+
const handlePageChange = (page) => {
if (page > 0 && page <= totalPages) {
setCurrentPage(page);
@@ -76,17 +82,27 @@ export default function UserPermissions() {
// 过滤用户列表
const getFilteredUsers = () => {
- if (!searchTerm.trim()) {
- return users;
+ let filtered = users;
+
+ // 应用状态过滤
+ if (statusFilter !== 'all') {
+ filtered = filtered.filter((user) =>
+ user.permissions.some((permission) => permission.status === statusFilter)
+ );
}
- return users.filter(
- (user) =>
- user.user_info?.username.toLowerCase().includes(searchTerm.toLowerCase()) ||
- user.user_info?.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
- user.user_info?.department.toLowerCase().includes(searchTerm.toLowerCase()) ||
- user.user_info?.role.toLowerCase().includes(searchTerm.toLowerCase())
- );
+ // 应用搜索过滤
+ if (searchTerm.trim()) {
+ filtered = filtered.filter(
+ (user) =>
+ user.user_info?.username.toLowerCase().includes(searchTerm.toLowerCase()) ||
+ user.user_info?.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
+ user.user_info?.department.toLowerCase().includes(searchTerm.toLowerCase()) ||
+ user.user_info?.role.toLowerCase().includes(searchTerm.toLowerCase())
+ );
+ }
+
+ return filtered;
};
const filteredUsers = getFilteredUsers();
@@ -196,22 +212,35 @@ export default function UserPermissions() {
<>
- {/*
-
-
-
-
-
-
+
+
+
+
-
*/}
+
{loading === 'loading' ? (
diff --git a/src/services/api.js b/src/services/api.js
index 200e69d..13a9291 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -214,4 +214,21 @@ export const switchToRealApi = async () => {
return isServerUp;
};
+// 权限相关API
+export const applyPermission = (data) => {
+ return post('/permissions/', data);
+};
+
+export const updatePermission = (data) => {
+ return post('/permissions/update_permission/', data);
+};
+
+export const approvePermission = (permissionId) => {
+ return post(`/permissions/approve_permission/${permissionId}`);
+};
+
+export const rejectPermission = (permissionId) => {
+ return post(`/permissions/reject_permission/${permissionId}`);
+};
+
export { get, post, put, del, upload };
diff --git a/src/services/permissionService.js b/src/services/permissionService.js
index c4141ac..a77532e 100644
--- a/src/services/permissionService.js
+++ b/src/services/permissionService.js
@@ -31,7 +31,8 @@ export const calculateExpiresAt = (duration) => {
};
/**
- * 申请知识库访问权限
+ * 申请知识库访问权限（已废弃，请使用store/knowledgeBase/knowledgeBase.thunks中的requestKnowledgeBaseAccess）
+ * @deprecated 请使用Redux thunk版本
* @param {Object} requestData - 请求数据
* @param {string} requestData.id - 知识库ID
* @param {string} requestData.accessType - 访问类型，如 '只读访问', '编辑权限'
@@ -39,7 +40,7 @@ export const calculateExpiresAt = (duration) => {
* @param {string} requestData.reason - 申请原因
* @returns {Promise} - API 请求的 Promise
*/
-export const requestKnowledgeBaseAccess = async (requestData) => {
+export const legacyRequestKnowledgeBaseAccess = async (requestData) => {
const apiRequestData = {
knowledge_base: requestData.id,
permissions: {
diff --git a/src/store/knowledgeBase/knowledgeBase.thunks.js b/src/store/knowledgeBase/knowledgeBase.thunks.js
index 97621d9..00cb565 100644
--- a/src/store/knowledgeBase/knowledgeBase.thunks.js
+++ b/src/store/knowledgeBase/knowledgeBase.thunks.js
@@ -165,15 +165,17 @@ export const changeKnowledgeBaseType = createAsyncThunk(
/**
* 申请知识库访问权限
* @param {Object} params - 参数
- * @param {string} params.knowledgeBaseId - 知识库ID
+ * @param {string} params.knowledge_base - 知识库ID
+ * @param {Object} params.permissions - 权限对象
+ * @param {string} params.reason - 申请原因
+ * @param {string} params.expires_at - 过期时间
* @returns {Promise} - Promise对象
*/
export const requestKnowledgeBaseAccess = createAsyncThunk(
'knowledgeBase/requestAccess',
async (params, { rejectWithValue, dispatch }) => {
try {
- const { knowledgeBaseId } = params;
- const response = await post(`/knowledge-bases/${knowledgeBaseId}/request_access/`);
+ const response = await post('/permissions/', params);
dispatch(
showNotification({
type: 'success',