diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx index 02a30d6b..ead43104 100644 --- a/src/pages/dependence/index.tsx +++ b/src/pages/dependence/index.tsx @@ -372,7 +372,7 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => { for (let i = 0; i < references.length; i++) { const index = value.findIndex((x) => x.id === references[i]); result.splice(index, 1, { - ...result[index], + ...value[index], status, }); } diff --git a/src/pages/dependence/logModal.tsx b/src/pages/dependence/logModal.tsx index 03edddc3..e7e2019b 100644 --- a/src/pages/dependence/logModal.tsx +++ b/src/pages/dependence/logModal.tsx @@ -94,13 +94,15 @@ const DependenceLogModal = ({ const { type, message, references } = socketMessage; if ( type === 'installDependence' && - message.includes('结束时间') && - references.length > 0 + references.length > 0 && + references.includes(dependence.id) ) { - setExecuting(false); - setIsRemoveFailed(message.includes('删除失败')); + if (message.includes('结束时间')) { + setExecuting(false); + setIsRemoveFailed(message.includes('删除失败')); + } + setValue(`${value}${message}`); } - setValue(`${value}${message}`); }, [socketMessage]); useEffect(() => { diff --git a/src/pages/subscription/index.tsx b/src/pages/subscription/index.tsx index 7e010b3e..6847fb01 100644 --- a/src/pages/subscription/index.tsx +++ b/src/pages/subscription/index.tsx @@ -510,7 +510,7 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => { for (let i = 0; i < references.length; i++) { const index = value.findIndex((x) => x.id === references[i]); result.splice(index, 1, { - ...result[index], + ...value[index], status: SubscriptionStatus.idle, }); }