From d95b995b41e7b12a3ab0b6d6461373b32b7673ba Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 28 Jul 2021 15:23:46 +0800
Subject: [PATCH] =?UTF-8?q?test:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=BC=96=E8=BE=91=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue   | 10 ++++++++--
 frontend/src/views/dataset/data/FieldEdit.vue |  7 ++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 2bccf7f778..4b0f131a3c 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -507,14 +507,20 @@
 
     <!--编辑视图使用的数据集的字段-->
     <el-dialog
-      v-dialogDrag
       :visible="editDsField"
       :show-close="false"
       class="dialog-css"
       :destroy-on-close="true"
       :fullscreen="true"
     >
-      <field-edit :param="table" @switchComponent="closeEditDsField" />
+      <field-edit :param="table" />
+      <div slot="title" class="dialog-footer">
+        <span style="font-size: 14px;">
+          {{ $t('dataset.field_manage') }}
+          <span v-if="table">[{{ table.name }}]</span>
+        </span>
+        <el-button size="mini" style="float: right;" @click="closeEditDsField">{{ $t('chart.close') }}</el-button>
+      </div>
     </el-dialog>
   </el-row>
 </template>
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 0647d94a02..65d9266e0a 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -16,7 +16,7 @@
         <el-form-item class="form-item">
           <el-button v-if="hasDataPermission('manage',param.privileges)" size="mini" @click="addCalcField">{{ $t('dataset.add_calc_field') }}</el-button>
         </el-form-item>
-        <el-form-item class="form-item" style="float: right;">
+        <el-form-item class="form-item" style="float: right;margin-right: 0;">
           <el-input
             v-model="searchField"
             size="mini"
@@ -241,6 +241,7 @@
       class="dialog-css"
       :destroy-on-close="true"
       :title="$t('dataset.add_calc_field')"
+      append-to-body
     >
       <calc-field-edit :param="param" :table-fields="tableFields" />
       <div slot="footer" class="dialog-footer">
@@ -324,10 +325,6 @@ export default {
       })
     },
 
-    closeEdit() {
-      this.$emit('switchComponent', { name: 'ViewTable', param: this.param })
-    },
-
     dqTrans(item, val) {
       if (val === 'd') {
         item.groupType = 'q'