From 58383e90224044ee95c54061665b9b767874192b Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sat, 28 May 2022 20:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dependence/index.tsx    |  2 +-
 src/pages/dependence/logModal.tsx | 12 +++++++-----
 src/pages/subscription/index.tsx  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

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,
         });
       }