From 9a8c0d135631eeab212be3acd8042ee9869aeea7 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 17 Jun 2021 11:56:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E5=81=9A=E6=98=AF=20=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0CurComponent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/AttrListExtend.vue | 2 +-
 frontend/src/components/canvas/store/snapshot.js             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/AttrListExtend.vue b/frontend/src/components/canvas/components/AttrListExtend.vue
index 37edce3419..4b0412355f 100644
--- a/frontend/src/components/canvas/components/AttrListExtend.vue
+++ b/frontend/src/components/canvas/components/AttrListExtend.vue
@@ -1,7 +1,7 @@
 <!-- TODO: 这个页面后续将用 JSX 重构 -->
 <template>
   <div class="attr-list">
-    <el-form label-width="80px">
+    <el-form label-width="80px" size="mini">
       <el-form-item v-for="(key, index) in styleKeys.filter(item => item != 'rotate')" :key="index" :label="map[key]+':'">
         <el-color-picker v-if="key == 'borderColor'" v-model="curComponent.style[key]" />
         <el-color-picker v-else-if="key == 'color'" v-model="curComponent.style[key]" />
diff --git a/frontend/src/components/canvas/store/snapshot.js b/frontend/src/components/canvas/store/snapshot.js
index e6eab66061..c2574de9c1 100644
--- a/frontend/src/components/canvas/store/snapshot.js
+++ b/frontend/src/components/canvas/store/snapshot.js
@@ -9,6 +9,7 @@ export default {
   },
   mutations: {
     undo(state) {
+      store.commit('setCurComponent', { component: null, index: null })
       if (state.snapshotIndex > 0) {
         state.snapshotIndex--
         store.commit('setComponentData', deepCopy(state.snapshotData[state.snapshotIndex]))
@@ -17,6 +18,7 @@ export default {
     },
 
     redo(state) {
+      store.commit('setCurComponent', { component: null, index: null })
       if (state.snapshotIndex < state.snapshotData.length - 1) {
         state.snapshotIndex++
         store.commit('setComponentData', deepCopy(state.snapshotData[state.snapshotIndex]))