From d760bcb09f1d1b373ffd417d322bc91a08c63b21 Mon Sep 17 00:00:00 2001
From: shimai <shimai@example.com>
Date: Mon, 09 Mar 2026 17:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/~chengmw/cloud-melody-front into test/shimai.huang/260309
---
web-app/src/components/common/OutboundCallWidget.jsx | 186 +++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 77 deletions(-)
diff --git a/web-app/src/components/common/OutboundCallWidget.jsx b/web-app/src/components/common/OutboundCallWidget.jsx
index 33ed299..f189e73 100644
--- a/web-app/src/components/common/OutboundCallWidget.jsx
+++ b/web-app/src/components/common/OutboundCallWidget.jsx
@@ -6,10 +6,18 @@
const OUTBOUND_JOBS_KEY = 'outbound_call_jobs';
// 活跃状态列表
-const ACTIVE_STATUSES = ['Scheduling', 'InProgress', 'Calling', 'Ringing', 'Answered'];
+const ACTIVE_STATUSES = ['Scheduling', 'Executing', 'Paused', 'Drafted', 'InProgress', 'Calling', 'Ringing', 'Answered'];
// Scheduling 状态 - 此状态变化不需要调用更新API
const SCHEDULING_STATUS = 'Scheduling';
+const BACKEND_STATUSES = ['Scheduling', 'Executing', 'Succeeded', 'Paused', 'Failed', 'Cancelled', 'Drafted'];
+const STATUS_TO_BACKEND = {
+ InProgress: 'Executing',
+ Calling: 'Executing',
+ Ringing: 'Executing',
+ Answered: 'Executing'
+};
+const isActiveStatus = (status) => !status || ACTIVE_STATUSES.includes(status);
/**
* 智能外呼通话显示组件
@@ -20,10 +28,11 @@
*/
const OutboundCallWidget = ({ onSwitchTab, onRefreshData }) => {
const { caseData } = useCaseData();
- const [isVisible, setIsVisible] = useState(false); // 默认隐藏
- const [isMinimized, setIsMinimized] = useState(true);
+ const [isVisible, setIsVisible] = useState(false); // 默认不显示，有任务时自动显示
+ const [isMinimized, setIsMinimized] = useState(false); // 默认展开（非最小化）
const [calls, setCalls] = useState([]);
const isMountedRef = useRef(true);
+ const fetchCallStatusRef = useRef(null); // 用于存储最新的 fetchCallStatus 函数引用
// 轮询间隔（毫秒）
const POLL_INTERVAL = 10000; // 10秒
@@ -31,7 +40,7 @@
// 最大重试次数
const MAX_RETRY_COUNT = 10;
- // 获取 caseId
+ // 获取 caseIdg
const caseId = caseData?.caseId || caseData?.case_id;
// 格式化通话时长
@@ -50,11 +59,12 @@
// 读取成功的任务
const storedSuccess = localStorage.getItem(OUTBOUND_JOBS_KEY);
const successJobs = storedSuccess ? JSON.parse(storedSuccess) : [];
+ console.log('读取成功任务:', successJobs.length, successJobs);
// 读取失败的任务
const storedFailed = localStorage.getItem(`${OUTBOUND_JOBS_KEY}_failed`);
const failedJobs = storedFailed ? JSON.parse(storedFailed) : [];
- console.log('读取失败任务:', failedJobs);
+ console.log('读取失败任务:', failedJobs.length, failedJobs);
// 清理失败任务 - 按 errorCode 不同策略
const now = Date.now();
@@ -139,11 +149,15 @@
const results = await Promise.all(
jobsToUpdate.map(async (job) => {
try {
+ const statusToUpdate = job.backendStatus || job.newStatus;
+ if (!statusToUpdate) {
+ return { success: false, job };
+ }
await OutboundBotAPIService.updateCallStatus({
jobId: job.jobId,
- callStatus: job.newStatus
+ callStatus: statusToUpdate
});
- console.log(`状态更新成功: ${job.jobId} -> ${job.newStatus}`);
+ console.log(`状态更新成功: ${job.jobId} -> ${statusToUpdate}`);
return { success: true, job };
} catch (err) {
console.error(`状态更新失败: ${job.jobId}`, err);
@@ -184,7 +198,7 @@
const now = Date.now();
return jobs.filter(job => {
// 检查是否为活跃状态
- if (ACTIVE_STATUSES.includes(job.callStatus)) {
+ if (isActiveStatus(job.callStatus)) {
// 检查是否超时（2小时）
const elapsed = now - (job.pollStartTime || job.startTime || now);
if (elapsed > 2 * 60 * 60 * 1000) {
@@ -201,22 +215,40 @@
* 查询通话状态
*/
const fetchCallStatus = useCallback(async () => {
+ console.log('fetchCallStatus 被调用');
+
// 从 localStorage 读取任务
const storedJobs = loadJobsFromStorage();
+ console.log('从 localStorage 读取的所有任务:', storedJobs);
// 分离成功任务和失败任务
- const successJobs = storedJobs.filter(job => !job.errorCode && ACTIVE_STATUSES.includes(job.callStatus));
+ const successJobs = storedJobs.filter(job => !job.errorCode && isActiveStatus(job.callStatus));
const failedJobs = storedJobs.filter(job => job.errorCode > 0);
+
+ console.log('成功任务数量:', successJobs.length, '失败任务数量:', failedJobs.length);
if (successJobs.length === 0) {
// 没有活跃任务，更新状态并返回
if (isMountedRef.current) {
setCalls([...failedJobs]);
- if (failedJobs.length > 0 && !isVisible) {
+ if (failedJobs.length > 0) {
setIsVisible(true);
}
}
return;
+ }
+
+ // 立即显示气泡（不等待 API 返回）
+ console.log('isMountedRef.current:', isMountedRef.current);
+ if (isMountedRef.current) {
+ // 先合并当前的成功任务和失败任务，立即显示
+ const immediateJobs = [...successJobs, ...failedJobs.filter(f => !successJobs.some(s => s.personId === f.personId))];
+ console.log('准备设置 calls:', immediateJobs);
+ setCalls(immediateJobs);
+ setIsVisible(true);
+ console.log('立即显示气泡，任务数:', immediateJobs.length, 'isVisible 设置为 true');
+ } else {
+ console.log('组件未挂载，跳过显示气泡');
}
// 收集需要更新到后端的任务（状态变化且原状态不是Scheduling）
@@ -234,21 +266,26 @@
if (response?.data) {
const newStatus = response.data.callStatus;
+ if (!newStatus) {
+ return job;
+ }
+ const backendStatus = STATUS_TO_BACKEND[newStatus] || newStatus;
// 如果状态发生变化，更新任务
if (newStatus !== job.callStatus) {
console.log(`任务 ${job.jobId} 状态更新: ${job.callStatus} -> ${newStatus}`);
// 检查是否需要调用后端更新API（排除Scheduling状态）
- if (job.callStatus !== SCHEDULING_STATUS) {
+ if (backendStatus !== SCHEDULING_STATUS && BACKEND_STATUSES.includes(backendStatus)) {
jobsNeedBackendUpdate.push({
...job,
- newStatus
+ newStatus,
+ backendStatus
});
}
// 如果是终态，可以从轮询中移除
- if (!ACTIVE_STATUSES.includes(newStatus)) {
+ if (!isActiveStatus(newStatus)) {
console.log(`任务 ${job.jobId} 达到终态: ${newStatus}`);
return null; // 标记为删除
}
@@ -303,21 +340,32 @@
// 保存到 localStorage
saveJobsToStorage(cleanedJobs);
- // 合并成功任务和失败任务
- const allJobs = [...cleanedJobs, ...failedJobs];
+ // 合并成功任务和失败任务，按 personId 去重（成功任务优先）
+ const successPersonIds = new Set(cleanedJobs.map(job => job.personId));
+ // 过滤掉已有成功任务的 personId 对应的失败任务
+ const filteredFailedJobs = failedJobs.filter(job => !successPersonIds.has(job.personId));
+ const allJobs = [...cleanedJobs, ...filteredFailedJobs];
// 更新组件状态
if (isMountedRef.current) {
setCalls(allJobs);
- // 如果有任务，显示气泡
- if (allJobs.length > 0 && !isVisible) {
+ // 如果有任务，显示气泡（使用函数式更新避免依赖 isVisible）
+ if (allJobs.length > 0) {
setIsVisible(true);
}
}
- }, [isVisible, triggerPageUpdate]);
+ }, [triggerPageUpdate]);
+
+ // 将最新的 fetchCallStatus 存储到 ref 中
+ useEffect(() => {
+ fetchCallStatusRef.current = fetchCallStatus;
+ }, [fetchCallStatus]);
// 定时轮询通话状态
useEffect(() => {
+ // 组件挂载时设置为 true
+ isMountedRef.current = true;
+
// 初始加载
fetchCallStatus();
@@ -330,6 +378,39 @@
isMountedRef.current = false;
};
}, [fetchCallStatus]);
+
+ // 监听 localStorage 变化，外呼成功后立即刷新
+ useEffect(() => {
+ const handleStorageChange = (e) => {
+ // 监听外呼任务存储的变化
+ if (e.key === OUTBOUND_JOBS_KEY || e.key === `${OUTBOUND_JOBS_KEY}_failed`) {
+ console.log('localStorage 变化，刷新外呼状态');
+ if (fetchCallStatusRef.current) {
+ fetchCallStatusRef.current();
+ }
+ }
+ };
+
+ // 监听 storage 事件（跨标签页同步）
+ window.addEventListener('storage', handleStorageChange);
+
+ // 同页面内的 localStorage 变化需要手动触发
+ // 创建自定义事件监听 - 使用 ref 避免依赖问题
+ const handleCustomStorageChange = () => {
+ console.log('同页面 localStorage 变化，刷新外呼状态');
+ if (fetchCallStatusRef.current) {
+ fetchCallStatusRef.current();
+ }
+ };
+ window.addEventListener('outbound-jobs-updated', handleCustomStorageChange);
+
+ console.log('事件监听器已设置: outbound-jobs-updated');
+
+ return () => {
+ window.removeEventListener('storage', handleStorageChange);
+ window.removeEventListener('outbound-jobs-updated', handleCustomStorageChange);
+ };
+ }, []); // 空依赖数组，只在组件挂载时设置一次
// 关闭气泡
const handleClose = (e) => {
@@ -367,6 +448,15 @@
// 其他状态的任务正常显示
return true;
});
+
+ // 添加调试日志
+ console.log('渲染检查 - calls:', calls.length, 'activeCalls:', activeCalls.length, 'isVisible:', isVisible, 'isMinimized:', isMinimized);
+
+ // 如果没有任务，不渲染任何内容
+ if (activeCalls.length === 0) {
+ console.log('无活跃任务，不渲染气泡');
+ return null;
+ }
// 如果最小化，显示AI客服图标
if (isMinimized) {
@@ -569,64 +659,6 @@
</div>
))}
- {/* 无通话时的占位提示 */}
- {activeCalls.length === 0 && isVisible && (
- <div
- style={{
- background: 'linear-gradient(135deg, #1A6FB8 0%, #0d4a8a 100%)',
- borderRadius: 12,
- padding: '16px 20px',
- color: 'white',
- boxShadow: '0 4px 16px rgba(26, 111, 184, 0.3)',
- position: 'relative',
- minWidth: 280,
- }}
- >
- {/* 关闭按钮 */}
- <button
- onClick={handleClose}
- style={{
- position: 'absolute',
- top: 8,
- right: 8,
- width: 24,
- height: 24,
- borderRadius: '50%',
- border: 'none',
- background: 'rgba(255,255,255,0.2)',
- color: 'white',
- cursor: 'pointer',
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center',
- fontSize: 14,
- }}
- >
- <i className="fas fa-times" />
- </button>
-
- <div style={{ display: 'flex', alignItems: 'center', gap: 10 }}>
- <div
- style={{
- width: 36,
- height: 36,
- borderRadius: '50%',
- background: 'rgba(255,255,255,0.2)',
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center',
- }}
- >
- <i className="fas fa-robot" style={{ fontSize: 18 }} />
- </div>
- <div>
- <div style={{ fontSize: 16, fontWeight: 600 }}>智能外呼系统</div>
- <div style={{ fontSize: 13, opacity: 0.85 }}>暂无进行中的通话</div>
- </div>
- </div>
- </div>
- )}
-
{/* CSS 动画 */}
<style>{`
@keyframes pulse {
@@ -638,4 +670,4 @@
);
};
-export default OutboundCallWidget;
\ No newline at end of file
+export default OutboundCallWidget;
--
Gitblit v1.8.0