From d5c30f59e04b8bf4af0271def482c82123fe6a90 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Fri, 7 Jan 2022 17:54:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E6=97=A0=E6=B3=95=E8=A7=A3=E9=99=A4=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useLockElement.ts | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/hooks/useLockElement.ts b/src/hooks/useLockElement.ts
index 6e0327ed..f863dc04 100644
--- a/src/hooks/useLockElement.ts
+++ b/src/hooks/useLockElement.ts
@@ -31,20 +31,26 @@ export default () => {
     const newElementList: PPTElement[] = JSON.parse(JSON.stringify(currentSlide.value.elements))
 
     if (handleElement.groupId) {
+      const groupElementIdList = []
       for (const element of newElementList) {
-        if (element.groupId === handleElement.groupId) element.lock = false
+        if (element.groupId === handleElement.groupId) {
+          element.lock = false
+          groupElementIdList.push(element.id)
+        }
       }
-      return newElementList
+      slidesStore.updateSlide({ elements: newElementList })
+      mainStore.setActiveElementIdList(groupElementIdList)
     }
-    
-    for (const element of newElementList) {
-      if (element.id === handleElement.id) {
-        element.lock = false
-        break
+    else {
+      for (const element of newElementList) {
+        if (element.id === handleElement.id) {
+          element.lock = false
+          break
+        }
       }
+      slidesStore.updateSlide({ elements: newElementList })
+      mainStore.setActiveElementIdList([handleElement.id])
     }
-    slidesStore.updateSlide({ elements: newElementList })
-    mainStore.setActiveElementIdList([handleElement.id])
     addHistorySnapshot()
   }