From c287b41afbcde2604de53b1a7461f343bc340f34 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 14 Jan 2022 10:57:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=84=E4=BB=B6=E9=97=B4?=
 =?UTF-8?q?=E9=9A=99=E5=9C=A8=E6=9C=89=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=97=B6=E4=B9=9F=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue         |  2 +-
 frontend/src/components/dataease/DeOutWidget.vue | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 0c339f1b8f..8832a2c813 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -535,7 +535,7 @@ export default {
       return this.$store.state.curComponent
     },
     curGap() {
-      return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix && this.element.type !== 'custom') ? this.componentGap : 0
+      return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0
     },
     ...mapState([
       'editor',
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index 42ef2809cd..a749aaad05 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -161,12 +161,13 @@ export default {
 
 <style lang="scss" scoped>
   .my-container {
-    position: absolute;
+    position: relative;
     overflow: auto;
     top: 0px;
     right: 0px;
     bottom: 0px;
     left: 0px;
+    border-radius: 5px;
   }
 
   .ccondition-main {
@@ -241,11 +242,12 @@ export default {
   }
 
   .first-element-contaner {
-    width: calc(100% - 10px);
+    /*width: calc(100% - 10px);*/
+    width: 100%;
     background: initial;
     position: absolute;
-    bottom: 5px;
-    margin: 0 4px;
+    bottom: 0px;
+    /*margin: 0 4px;*/
 
     div {
       width: 100%;
@@ -258,7 +260,7 @@ export default {
   .first-element-grid-contaner {
     background: #fff;
     border: 1px solid #d7dae2;
-    top: 5px;
+    top: 0px;
   }
 
   .condition-main-line {