From 1ba31d4ea914395d5238869e9acbc7c43a20de7d Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 9 Nov 2022 18:04:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceImpl/TimeDateRangeServiceImpl.js      |  4 ++--
 frontend/src/views/dataset/data/ViewTable.vue    | 15 ++++++++++++---
 .../dataset/data/components/filterFiled.vue      | 16 +++++++++++-----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
index c411217f3e..301074284a 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
@@ -279,8 +279,8 @@ class TimeDateRangeServiceImpl extends WidgetService {
     if (element.options.attrs.showTime && element.options.attrs.accuracy) {
       labelFormat = labelFormat + ' ' + element.options.attrs.accuracy
     }
-    let [ start, end ] = values
-    
+    let [start, end] = values
+
     const attrs = element.options.attrs
 
     if (attrs.default.sDynamicSuffixTime && attrs.default.isDynamic && attrs.default.dkey === 4 && attrs.showTime) {
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 44ddc7a8cc..efc676bbd2 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -191,7 +191,7 @@
       v-if="showExport"
       v-dialogDrag
       :visible.sync="showExport"
-      width="600px"
+      width="800px"
       class="de-dialog-form form-tree-cont"
       :title="$t('dataset.export_dataset')"
       append-to-body
@@ -219,7 +219,9 @@
           prop="expressionTree"
         >
           <div class="tree-cont">
-            <rowAuth ref="rowAuth" />
+            <div class="content">
+              <rowAuth ref="rowAuth" />
+            </div>
           </div>
         </el-form-item>
       </el-form>
@@ -518,7 +520,14 @@ export default {
   .tree-cont {
     height: 200px;
     width: 100%;
-    overflow-x: auto;
+    padding: 16px;
+    border-radius: 4px;
+    border: 1px solid var(--deBorderBase, #DCDFE6);
+    overflow: auto;
+    .content {
+      height: 100%;
+      width: 100%;
+    }
   }
 }
 .icon-class {
diff --git a/frontend/src/views/dataset/data/components/filterFiled.vue b/frontend/src/views/dataset/data/components/filterFiled.vue
index d8c6cbbb1c..2fca06be9b 100644
--- a/frontend/src/views/dataset/data/components/filterFiled.vue
+++ b/frontend/src/views/dataset/data/components/filterFiled.vue
@@ -14,6 +14,7 @@
       >
         <el-input
           v-model="item.name"
+          class="w100"
           :placeholder="$t('auth.selct_filter_fields')"
           size="mini"
           @input="cancel"
@@ -55,6 +56,7 @@
         <el-select
           v-model="item.filterType"
           size="mini"
+          class="w100"
           :placeholder="$t('auth.select')"
           @change="filterTypeChange"
         >
@@ -69,7 +71,7 @@
         <template v-if="item.filterType === 'logic'">
           <el-select
             v-model="item.term"
-            class="w100"
+            class="w120"
             size="mini"
             :placeholder="$t('auth.default_method')"
             @change="onOptionsChange"
@@ -93,7 +95,7 @@
           <template v-else-if="!['null', 'empty', 'not_null', 'not_empty'].includes(item.term)">
             <el-input
               v-model="item.value"
-              class="w70 mar5"
+              class="w120 mar5"
               size="mini"
             />
             <div class="de-bottom-line" />
@@ -293,7 +295,7 @@ export default {
       const { term, fieldId, filterType } = this.item
       const isNull = ['null', 'empty', 'not_null', 'not_empty'].includes(term) && filterType === 'logic'
       return {
-        width: !fieldId ? '270px' : isNull ? '670px' : '750px'
+        width: !fieldId ? '240px' : isNull ? '540px' : '670px'
       }
     },
     operators() {
@@ -491,10 +493,14 @@ export default {
     width: 170px;
   }
 
-  .w100.el-select {
+  .w100 {
     width: 100px;
   }
 
+  .w120 {
+    width: 120px;
+  }
+
   .w70 {
     width: 70px;
   }
@@ -543,7 +549,7 @@ export default {
     position: absolute;
     right: 5px;
     bottom: 9px;
-    width: 70px;
+    width: 100px;
     z-index: 10;
   }