From 08ef70ada387a3c7b67828a45882948c477de8a9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 13 Nov 2023 15:51:19 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dataease/DeOutWidget.vue   |  3 ++-
 .../panel/filter/filterMain/FilterHead.vue    | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index d68712a26c..237796980c 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -280,7 +280,7 @@ export default {
   letter-spacing: 0px !important;
   width: 100%;
   .widget-required {
-    width: calc(100% - 10px) !important;
+    width: calc(100% - 12px) !important;
     float: left !important;
   }
   .widget-required-symbol {
@@ -288,6 +288,7 @@ export default {
     height: 40px;
     line-height: 40px;
     float: right;
+    width: 12px;
   }
 }
 
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
index 925c67809b..ea15432607 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue
@@ -1,6 +1,8 @@
 <template>
   <el-row>
-    <el-col :span="20">
+    <el-col
+      class="filter-field-container"
+    >
       <div class="filter-field">
         <div class="field-content">
 
@@ -13,7 +15,7 @@
                 animation="300"
                 :move="onMove"
                 class="row wrap justify-space-around theme-drag"
-                style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;"
+                style="width:calc(100% - 25px);height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;"
                 @end="end2"
               >
 
@@ -38,7 +40,9 @@
         </div>
       </div>
     </el-col>
-    <el-col :span="4">
+    <el-col
+      class="filter-required-container"
+    >
       <div class="de-filter-required">
         <el-checkbox
           v-model="element.options.attrs.required"
@@ -105,6 +109,14 @@ export default {
 
 </script>
 <style lang="scss" scoped>
+.filter-field-container {
+  width: calc(100% - 70px);
+  float: left;
+}
+.filter-required-container {
+  width: 70px;
+  float: right;
+}
 .de-filter-required {
   height: 40px;
   line-height: 40px;
@@ -116,7 +128,7 @@ export default {
   overflow-x: overlay;
   .field-content {
     position: relative;
-    display: table;
+    // display: table;
     width: 100%;
     height: 100%;
     white-space: nowrap;