mirror of
https://github.com/Funkoala14/KnowledgeBase_OOIN.git
synced 2025-06-08 07:20:55 +08:00
[dev]update profile
This commit is contained in:
parent
5502bd579c
commit
b4d708d994
@ -1,22 +1,22 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
import { updateProfileThunk } from '../store/auth/auth.thunk';
|
||||
import ChangePasswordModal from './ChangePasswordModal';
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import { updateProfileThunk } from "../store/auth/auth.thunk";
|
||||
import ChangePasswordModal from "./ChangePasswordModal";
|
||||
|
||||
// 部门和组别的映射关系
|
||||
const departmentGroups = {
|
||||
达人部门: ['达人'],
|
||||
商务部门: ['商务'],
|
||||
样本中心: ['样本'],
|
||||
产品部门: ['产品'],
|
||||
AI自媒体: ['AI自媒体'],
|
||||
HR: ['HR'],
|
||||
技术部门: ['技术'],
|
||||
达人部门: ["达人"],
|
||||
商务部门: ["商务"],
|
||||
样本中心: ["样本"],
|
||||
产品部门: ["产品"],
|
||||
AI自媒体: ["AI自媒体"],
|
||||
HR: ["HR"],
|
||||
技术部门: ["技术"],
|
||||
};
|
||||
|
||||
function UserSettingsModal({ show, onClose }) {
|
||||
const { user, loading } = useSelector((state) => state.auth);
|
||||
const [lastPasswordChange] = useState('30天前'); // This would come from backend in real app
|
||||
const [lastPasswordChange] = useState("30天前"); // This would come from backend in real app
|
||||
const [formData, setFormData] = useState({});
|
||||
const [showChangePassword, setShowChangePassword] = useState(false);
|
||||
// 可选的组别列表
|
||||
@ -52,11 +52,11 @@ function UserSettingsModal({ show, onClose }) {
|
||||
const handleInputChange = (e) => {
|
||||
const { name, value } = e.target;
|
||||
|
||||
if (name === 'department') {
|
||||
if (name === "department") {
|
||||
setFormData({
|
||||
...formData,
|
||||
[name]: value,
|
||||
['group']: '',
|
||||
["group"]: "",
|
||||
});
|
||||
} else {
|
||||
setFormData({
|
||||
@ -69,7 +69,7 @@ function UserSettingsModal({ show, onClose }) {
|
||||
if (errors[name]) {
|
||||
setErrors({
|
||||
...errors,
|
||||
[name]: '',
|
||||
[name]: "",
|
||||
});
|
||||
}
|
||||
};
|
||||
@ -79,12 +79,12 @@ function UserSettingsModal({ show, onClose }) {
|
||||
setSubmitted(true);
|
||||
|
||||
if (validateForm()) {
|
||||
console.log('Form submitted successfully!');
|
||||
console.log('Update data:', formData);
|
||||
console.log("Form submitted successfully!");
|
||||
console.log("Update data:", formData);
|
||||
try {
|
||||
await dispatch(updateProfileThunk(formData)).unwrap();
|
||||
} catch (error) {
|
||||
console.error('Signup failed:', error);
|
||||
console.error("Signup failed:", error);
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -92,21 +92,23 @@ function UserSettingsModal({ show, onClose }) {
|
||||
const validateForm = () => {
|
||||
const newErrors = {};
|
||||
if (!formData.email) {
|
||||
newErrors.email = 'Email is required';
|
||||
} else if (!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(formData.email)) {
|
||||
newErrors.email = 'Invalid email address';
|
||||
newErrors.email = "Email is required";
|
||||
} else if (
|
||||
!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(formData.email)
|
||||
) {
|
||||
newErrors.email = "Invalid email address";
|
||||
}
|
||||
|
||||
if (!formData.name) {
|
||||
newErrors.name = 'Name is required';
|
||||
newErrors.name = "Name is required";
|
||||
}
|
||||
|
||||
if (!formData.department) {
|
||||
newErrors.department = '请选择部门';
|
||||
newErrors.department = "请选择部门";
|
||||
}
|
||||
|
||||
if (!formData.group) {
|
||||
newErrors.group = '请选择组别';
|
||||
newErrors.group = "请选择组别";
|
||||
}
|
||||
|
||||
setErrors(newErrors);
|
||||
@ -114,55 +116,73 @@ function UserSettingsModal({ show, onClose }) {
|
||||
};
|
||||
|
||||
return (
|
||||
<div className='modal show d-block' style={{ backgroundColor: 'rgba(0,0,0,0.5)' }}>
|
||||
<div className='modal-dialog modal-dialog-centered'>
|
||||
<form className='modal-content' onSubmit={handleSubmit}>
|
||||
<div className='modal-header border-0'>
|
||||
<h5 className='modal-title'>个人设置</h5>
|
||||
<button type='button' className='btn-close' onClick={onClose}></button>
|
||||
<div
|
||||
className="modal show d-block"
|
||||
style={{ backgroundColor: "rgba(0,0,0,0.5)" }}
|
||||
>
|
||||
<div className="modal-dialog modal-dialog-centered">
|
||||
<form className="modal-content" onSubmit={handleSubmit}>
|
||||
<div className="modal-header border-0">
|
||||
<h5 className="modal-title">个人设置</h5>
|
||||
<button
|
||||
type="button"
|
||||
className="btn-close"
|
||||
onClick={onClose}
|
||||
></button>
|
||||
</div>
|
||||
<div className='modal-body'>
|
||||
<div className='mb-4'>
|
||||
<h6 className='text-secondary mb-3'>个人信息</h6>
|
||||
<div className='mb-3'>
|
||||
<label className='form-label text-secondary'>用户名</label>
|
||||
<input type='text' className='form-control' value={user?.username || ''} readOnly />
|
||||
</div>
|
||||
<div className='mb-3'>
|
||||
<label className='form-label text-secondary'>姓名</label>
|
||||
<div className="modal-body">
|
||||
<div className="mb-4">
|
||||
<h6 className="text-secondary mb-3">个人信息</h6>
|
||||
<div className="mb-3">
|
||||
<label className="form-label text-secondary">用户名</label>
|
||||
<input
|
||||
type='text'
|
||||
className='form-control'
|
||||
value={formData?.name || ''}
|
||||
type="text"
|
||||
className="form-control"
|
||||
value={user?.username || ""}
|
||||
readOnly
|
||||
/>
|
||||
</div>
|
||||
<div className="mb-3">
|
||||
<label className="form-label text-secondary">姓名</label>
|
||||
<input
|
||||
type="text"
|
||||
className="form-control"
|
||||
value={formData?.name || ""}
|
||||
name="name"
|
||||
onChange={handleInputChange}
|
||||
disabled={loading}
|
||||
/>
|
||||
{submitted && errors.name && <div className='invalid-feedback'>{errors.name}</div>}
|
||||
{submitted && errors.name && (
|
||||
<div className="invalid-feedback">{errors.name}</div>
|
||||
)}
|
||||
</div>
|
||||
<div className='mb-3'>
|
||||
<label className='form-label text-secondary'>邮箱</label>
|
||||
<div className="mb-3">
|
||||
<label className="form-label text-secondary">邮箱</label>
|
||||
<input
|
||||
type='email'
|
||||
className='form-control'
|
||||
value={formData?.email || 'admin@ooin.com'}
|
||||
type="email"
|
||||
name="email"
|
||||
className="form-control"
|
||||
value={formData?.email || "admin@ooin.com"}
|
||||
onChange={handleInputChange}
|
||||
disabled={loading}
|
||||
/>
|
||||
{submitted && errors.email && <div className='invalid-feedback'>{errors.email}</div>}
|
||||
{submitted && errors.email && (
|
||||
<div className="invalid-feedback">{errors.email}</div>
|
||||
)}
|
||||
</div>
|
||||
<div className='mb-3'>
|
||||
<div className="mb-3">
|
||||
<select
|
||||
className={`form-select form-select-lg${
|
||||
submitted && errors.department ? ' is-invalid' : ''
|
||||
submitted && errors.department ? " is-invalid" : ""
|
||||
}`}
|
||||
id='department'
|
||||
name='department'
|
||||
id="department"
|
||||
name="department"
|
||||
value={formData.department}
|
||||
onChange={handleInputChange}
|
||||
disabled={loading}
|
||||
required
|
||||
>
|
||||
<option value='' disabled>
|
||||
<option value="" disabled>
|
||||
选择部门
|
||||
</option>
|
||||
{Object.keys(departmentGroups).map((dept, index) => (
|
||||
@ -172,23 +192,23 @@ function UserSettingsModal({ show, onClose }) {
|
||||
))}
|
||||
</select>
|
||||
{submitted && errors.department && (
|
||||
<div className='invalid-feedback'>{errors.department}</div>
|
||||
<div className="invalid-feedback">{errors.department}</div>
|
||||
)}
|
||||
</div>
|
||||
<div className='mb-3'>
|
||||
<div className="mb-3">
|
||||
<select
|
||||
className={`form-select form-select-lg${
|
||||
submitted && errors.group ? ' is-invalid' : ''
|
||||
submitted && errors.group ? " is-invalid" : ""
|
||||
}`}
|
||||
id='group'
|
||||
name='group'
|
||||
id="group"
|
||||
name="group"
|
||||
value={formData.group}
|
||||
onChange={handleInputChange}
|
||||
disabled={loading || !formData.department}
|
||||
required
|
||||
>
|
||||
<option value='' disabled>
|
||||
{formData.department ? '选择组别' : '请先选择部门'}
|
||||
<option value="" disabled>
|
||||
{formData.department ? "选择组别" : "请先选择部门"}
|
||||
</option>
|
||||
{availableGroups.map((group, index) => (
|
||||
<option key={index} value={group}>
|
||||
@ -196,22 +216,26 @@ function UserSettingsModal({ show, onClose }) {
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
{submitted && errors.group && <div className='invalid-feedback'>{errors.group}</div>}
|
||||
{submitted && errors.group && (
|
||||
<div className="invalid-feedback">{errors.group}</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className='mb-4'>
|
||||
<h6 className='text-secondary mb-3'>安全设置</h6>
|
||||
<div className='d-flex justify-content-between align-items-center p-3 bg-light rounded'>
|
||||
<div className="mb-4">
|
||||
<h6 className="text-secondary mb-3">安全设置</h6>
|
||||
<div className="d-flex justify-content-between align-items-center p-3 bg-light rounded">
|
||||
<div>
|
||||
<div className='d-flex align-items-center gap-2'>
|
||||
<i className='bi bi-key'></i>
|
||||
<div className="d-flex align-items-center gap-2">
|
||||
<i className="bi bi-key"></i>
|
||||
<span>修改密码</span>
|
||||
</div>
|
||||
<small className='text-secondary'>上次修改：{lastPasswordChange}</small>
|
||||
<small className="text-secondary">
|
||||
上次修改：{lastPasswordChange}
|
||||
</small>
|
||||
</div>
|
||||
<button
|
||||
className='btn btn-outline-dark btn-sm'
|
||||
className="btn btn-outline-dark btn-sm"
|
||||
onClick={(e) => {
|
||||
e.preventDefault();
|
||||
setShowChangePassword(true);
|
||||
@ -222,70 +246,90 @@ function UserSettingsModal({ show, onClose }) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className='d-none mb-4'>
|
||||
<h6 className='text-secondary mb-3'>安全设置</h6>
|
||||
<div className='d-flex justify-content-between align-items-center p-3 bg-light rounded'>
|
||||
<div className="d-none mb-4">
|
||||
<h6 className="text-secondary mb-3">安全设置</h6>
|
||||
<div className="d-flex justify-content-between align-items-center p-3 bg-light rounded">
|
||||
<div>
|
||||
<div className='d-flex align-items-center gap-2'>
|
||||
<i className='bi bi-key'></i>
|
||||
<div className="d-flex align-items-center gap-2">
|
||||
<i className="bi bi-key"></i>
|
||||
<span>修改密码</span>
|
||||
</div>
|
||||
<small className='text-secondary'>上次修改：{lastPasswordChange}</small>
|
||||
<small className="text-secondary">
|
||||
上次修改：{lastPasswordChange}
|
||||
</small>
|
||||
</div>
|
||||
<button className='btn btn-outline-dark btn-sm'>修改</button>
|
||||
<button className="btn btn-outline-dark btn-sm">修改</button>
|
||||
</div>
|
||||
<div className='d-flex justify-content-between align-items-center p-3 bg-light rounded mt-3'>
|
||||
<div className="d-flex justify-content-between align-items-center p-3 bg-light rounded mt-3">
|
||||
<div>
|
||||
<div className='d-flex align-items-center gap-2'>
|
||||
<i className='bi bi-shield-check'></i>
|
||||
<div className="d-flex align-items-center gap-2">
|
||||
<i className="bi bi-shield-check"></i>
|
||||
<span>双重认证</span>
|
||||
</div>
|
||||
<small className='text-secondary'>增强账户安全性</small>
|
||||
<small className="text-secondary">增强账户安全性</small>
|
||||
</div>
|
||||
<button className='btn btn-outline-dark btn-sm'>设置</button>
|
||||
<button className="btn btn-outline-dark btn-sm">设置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className='d-none'>
|
||||
<h6 className='text-secondary mb-3'>通知设置</h6>
|
||||
<div className='form-check form-switch mb-3 dark-switch'>
|
||||
<div className="d-none">
|
||||
<h6 className="text-secondary mb-3">通知设置</h6>
|
||||
<div className="form-check form-switch mb-3 dark-switch">
|
||||
<input
|
||||
className='form-check-input'
|
||||
type='checkbox'
|
||||
id='notificationSwitch1'
|
||||
className="form-check-input"
|
||||
type="checkbox"
|
||||
id="notificationSwitch1"
|
||||
defaultChecked
|
||||
/>
|
||||
<label className='form-check-label' htmlFor='notificationSwitch1'>
|
||||
<label
|
||||
className="form-check-label"
|
||||
htmlFor="notificationSwitch1"
|
||||
>
|
||||
访问请求通知
|
||||
</label>
|
||||
<div className='text-secondary small'>新的数据集访问申请通知</div>
|
||||
<div className="text-secondary small">
|
||||
新的数据集访问申请通知
|
||||
</div>
|
||||
<div className='form-check form-switch dark-switch'>
|
||||
</div>
|
||||
<div className="form-check form-switch dark-switch">
|
||||
<input
|
||||
className='form-check-input'
|
||||
type='checkbox'
|
||||
id='notificationSwitch2'
|
||||
className="form-check-input"
|
||||
type="checkbox"
|
||||
id="notificationSwitch2"
|
||||
defaultChecked
|
||||
/>
|
||||
<label className='form-check-label' htmlFor='notificationSwitch2'>
|
||||
<label
|
||||
className="form-check-label"
|
||||
htmlFor="notificationSwitch2"
|
||||
>
|
||||
安全提醒
|
||||
</label>
|
||||
<div className='text-secondary small'>异常登录和权限变更提醒</div>
|
||||
<div className="text-secondary small">
|
||||
异常登录和权限变更提醒
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className='modal-footer border-0'>
|
||||
<button type='button' disabled={loading} className='btn btn-outline-dark' onClick={onClose}>
|
||||
</div>
|
||||
<div className="modal-footer border-0">
|
||||
<button
|
||||
type="button"
|
||||
disabled={loading}
|
||||
className="btn btn-outline-dark"
|
||||
onClick={onClose}
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
<button type='submit' className='btn btn-dark' disabled={loading}>
|
||||
<button type="submit" className="btn btn-dark" disabled={loading}>
|
||||
保存更改
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{showChangePassword && (
|
||||
<ChangePasswordModal show={showChangePassword} onClose={() => setShowChangePassword(false)} />
|
||||
<ChangePasswordModal
|
||||
show={showChangePassword}
|
||||
onClose={() => setShowChangePassword(false)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@ -47,15 +47,12 @@ export default function Chat() {
|
||||
|
||||
// If we have a knowledgeBaseId but no chatId, check if we have an existing chat or create a new one
|
||||
useEffect(() => {
|
||||
console.log('Chat.jsx: chatHistory', chatHistory);
|
||||
|
||||
// 只有当 knowledgeBaseId 存在但 chatId 不存在，且聊天历史已加载完成时才执行
|
||||
if (knowledgeBaseId && !chatId && status === 'succeeded' && !status.includes('loading')) {
|
||||
console.log('Chat.jsx: 创建新聊天...');
|
||||
|
||||
// 处理可能的多个知识库ID (以逗号分隔)
|
||||
const knowledgeBaseIds = knowledgeBaseId.split(',').map((id) => id.trim());
|
||||
console.log('Chat.jsx: 处理知识库ID列表:', knowledgeBaseIds);
|
||||
|
||||
// 创建新聊天 - 使用新的API创建会话
|
||||
dispatch(
|
||||
|
||||
@ -6,8 +6,8 @@ import KnowledgeBaseDetail from '../pages/KnowledgeBase/Detail/KnowledgeBaseDeta
|
||||
import Chat from '../pages/Chat/Chat';
|
||||
import PermissionsPage from '../pages/Permissions/PermissionsPage';
|
||||
import Loading from '../components/Loading';
|
||||
import Login from '../pages/Auth/Login';
|
||||
import Signup from '../pages/Auth/Signup';
|
||||
import Login from '../pages/auth/Login';
|
||||
import Signup from '../pages/auth/Signup';
|
||||
import ProtectedRoute from './protectedRoute';
|
||||
import { useSelector } from 'react-redux';
|
||||
import NotificationSnackbar from '../components/NotificationSnackbar';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user