From 901d7a852d11c3e83014efe03818c95c73e275c3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Dec 2021 16:47:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=A7=E4=BB=B6=E5=A4=96=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/TextAttr.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 1bca4d1795..0e8ce60e93 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -78,14 +78,6 @@
         <el-input v-model="styleInfo.margin" type="number" size="mini" min="0" max="99" @change="styleChange" />
       </div>
 
-      <el-tooltip v-if="attrShow('padding')" :content="$t('panel.margin')">
-        <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-margin" />
-      </el-tooltip>
-
-      <div v-if="attrShow('padding')" style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.padding" type="number" size="mini" min="0" max="99" @change="styleChange" />
-      </div>
-
       <el-tooltip v-if="attrShow('opacity')" :content="$t('panel.opacity')">
         <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-touming" />
       </el-tooltip>

From 784d5f335de6f548912c84b938153827c7136ebe Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Dec 2021 17:06:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=96=87=E6=9C=AC=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=88=87=E6=8D=A2=E5=8D=95=E9=80=89=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/edit/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index c25f8668e7..5a08771880 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -661,8 +661,6 @@ export default {
     },
     sureFilter() {
       this.currentFilterCom.options.value = []
-      const component = deepCopy(this.currentFilterCom)
-      this.$store.commit('setComponentWithId', component)
       this.$store.commit('recordSnapshot', 'sureFilter')
       this.closeFilter()
     },

From 6c8a2d76850e55d8bde0b32ca6b463063c9aec87 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Dec 2021 17:38:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/edit/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 5a08771880..fe14354dad 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -661,6 +661,7 @@ export default {
     },
     sureFilter() {
       this.currentFilterCom.options.value = []
+      this.$store.commit('setComponentWithId', this.currentFilterCom)
       this.$store.commit('recordSnapshot', 'sureFilter')
       this.closeFilter()
     },