diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
new file mode 100644
index 0000000000..1407c17400
--- /dev/null
+++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue
@@ -0,0 +1,610 @@
+<template>
+  <el-row>
+    <el-form ref="form" :model="fieldForm" size="mini" class="row-style">
+      <el-form-item>
+        <span style="width: 80px;font-size: 12px">{{ $t('dataset.field_name') }}</span>
+        <el-input v-model="fieldForm.name" style="width: 80%;" size="mini" :placeholder="$t('dataset.input_name')" />
+      </el-form-item>
+    </el-form>
+
+    <el-row :style="mode === 'normal' ? {height: '420px'} : {height: '100px'}">
+      <el-col :span="14" style="height: 100%">
+        <el-row>
+          <el-row v-show="mode === 'normal'">
+            <span>{{ $t('dataset.field_exp') }}</span>
+            <codemirror
+              ref="myCm"
+              v-model="fieldForm.originName"
+              class="codemirror"
+              :options="cmOption"
+              @ready="onCmReady"
+              @focus="onCmFocus"
+              @input="onCmCodeChange"
+            />
+          </el-row>
+          <el-row style="margin-top: 10px;">
+            <el-form ref="form" :model="fieldForm" size="mini" class="row-style">
+              <el-form-item>
+                <span style="width: 80px;font-size: 12px">{{ $t('dataset.data_type') }}</span>
+                <el-radio-group v-model="fieldForm.groupType" size="mini">
+                  <el-radio-button label="d">{{ $t('chart.dimension') }}</el-radio-button>
+                  <el-radio-button label="q">{{ $t('chart.quota') }}</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item>
+                <span style="width: 80px;font-size: 12px">{{ $t('dataset.field_type') }}</span>
+                <el-select v-model="fieldForm.deType" size="mini">
+                  <el-option
+                    v-for="item in fields"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                    <span style="float: left">
+                      <svg-icon v-if="item.value === 0" icon-class="field_text" class="field-icon-text" />
+                      <svg-icon v-if="item.value === 1" icon-class="field_time" class="field-icon-time" />
+                      <svg-icon
+                        v-if="item.value === 2 || item.value === 3"
+                        icon-class="field_value"
+                        class="field-icon-value"
+                      />
+                      <svg-icon v-if="item.value === 5" icon-class="field_location" class="field-icon-location" />
+                    </span>
+                    <span style="float: left; color: #8492a6; font-size: 12px">{{ item.label }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-row>
+        </el-row>
+      </el-col>
+      <el-col v-show="mode === 'normal'" :span="10" style="height: 100%;border-left: 1px solid #E6E6E6;">
+        <el-col :span="12" style="height: 100%" class="padding-lr">
+          <span>
+            {{ $t('dataset.click_ref_field') }}
+            <el-tooltip class="item" effect="dark" placement="bottom">
+              <div slot="content">
+                引用字段以 "[" 开始， "]" 结束
+                <br>
+                请勿修改引用内容，否则将引用失败
+                <br>
+                若输入与引用字段相同格式的内容，将被当作引用字段处理
+              </div>
+              <i class="el-icon-info" style="cursor: pointer;" />
+            </el-tooltip>
+          </span>
+          <el-input
+            v-model="searchField"
+            size="mini"
+            :placeholder="$t('dataset.search')"
+            prefix-icon="el-icon-search"
+            clearable
+          />
+          <div class="field-height">
+            <span>{{ $t('chart.dimension') }}</span>
+            <draggable
+              v-model="dimensionData"
+              :options="{group:{name: 'drag',pull:'clone'},sort: true}"
+              animation="300"
+              class="drag-list"
+              :disabled="true"
+            >
+              <transition-group>
+                <span
+                  v-for="item in dimensionData"
+                  :key="item.id"
+                  class="item-dimension"
+                  :title="item.name"
+                  @click="insertFieldToCodeMirror('['+item.id+']')"
+                >
+                  <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
+                  <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
+                  <svg-icon
+                    v-if="item.deType === 2 || item.deType === 3"
+                    icon-class="field_value"
+                    class="field-icon-value"
+                  />
+                  <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+                  {{ item.name }}
+                </span>
+              </transition-group>
+            </draggable>
+          </div>
+          <div class="field-height">
+            <span>{{ $t('chart.quota') }}</span>
+            <draggable
+              v-model="quotaData"
+              :options="{group:{name: 'drag',pull:'clone'},sort: true}"
+              animation="300"
+              class="drag-list"
+              :disabled="true"
+            >
+              <transition-group>
+                <span
+                  v-for="item in quotaData"
+                  :key="item.id"
+                  class="item-quota"
+                  :title="item.name"
+                  @click="insertFieldToCodeMirror('['+item.id+']')"
+                >
+                  <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
+                  <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
+                  <svg-icon
+                    v-if="item.deType === 2 || item.deType === 3"
+                    icon-class="field_value"
+                    class="field-icon-value"
+                  />
+                  <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+                  <span>{{ item.name }}</span>
+                </span>
+              </transition-group>
+            </draggable>
+          </div>
+        </el-col>
+        <el-col :span="12" style="height: 100%" class="padding-lr">
+          <span>
+            {{ $t('dataset.click_ref_function') }}
+            <el-tooltip class="item" effect="dark" placement="bottom">
+              <div slot="content">
+                使用数据集对应数据库类型所支持的函数，语法同对应数据库
+                <br>
+                如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt])
+                <br>
+                非直连模式数据集，使用Doris数据库函数，可参考Doris官网 https://doris.apache.org/zh-CN/
+              </div>
+              <i class="el-icon-info" style="cursor: pointer;" />
+            </el-tooltip>
+          </span>
+          <el-input
+            v-model="searchFunction"
+            size="mini"
+            :placeholder="$t('dataset.search')"
+            prefix-icon="el-icon-search"
+            clearable
+          />
+          <el-row class="function-height">
+            <el-popover
+              v-for="(item,index) in functionData"
+              :key="index"
+              class="function-pop"
+              placement="right"
+              width="200"
+              trigger="hover"
+              :open-delay="500"
+            >
+              <p class="pop-title">{{ item.name }}</p>
+              <p class="pop-info">{{ item.func }}</p>
+              <p class="pop-info">{{ item.desc }}</p>
+              <span slot="reference" class="function-style" @click="insertParamToCodeMirror(item.func)">{{
+                item.func
+              }}</span>
+            </el-popover>
+          </el-row>
+        </el-col>
+      </el-col>
+    </el-row>
+
+    <el-row>
+      <div class="dialog-button">
+        <el-button size="mini" @click="closeCalcField">{{ $t('dataset.cancel') }}</el-button>
+        <el-button
+          :disabled="!fieldForm.name || !fieldForm.originName"
+          type="primary"
+          size="mini"
+          @click="saveCalcField"
+        >{{ $t('dataset.confirm') }}
+        </el-button>
+      </div>
+    </el-row>
+  </el-row>
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+import { codemirror } from 'vue-codemirror'
+// 核心样式
+import 'codemirror/lib/codemirror.css'
+// 引入主题后还需要在 options 中指定主题才会生效
+import 'codemirror/theme/solarized.css'
+import 'codemirror/mode/sql/sql.js'
+// require active-line.js
+import 'codemirror/addon/selection/active-line.js'
+// closebrackets
+import 'codemirror/addon/edit/closebrackets.js'
+// keyMap
+import 'codemirror/mode/clike/clike.js'
+import 'codemirror/addon/edit/matchbrackets.js'
+import 'codemirror/addon/comment/comment.js'
+import 'codemirror/addon/dialog/dialog.js'
+import 'codemirror/addon/dialog/dialog.css'
+import 'codemirror/addon/search/searchcursor.js'
+import 'codemirror/addon/search/search.js'
+import 'codemirror/keymap/emacs.js'
+// 引入代码自动提示插件
+import 'codemirror/addon/hint/show-hint.css'
+import 'codemirror/addon/hint/sql-hint'
+import 'codemirror/addon/hint/show-hint'
+import { post } from '../../../api/dataset/dataset'
+
+export default {
+  name: 'CalcChartFieldEdit',
+  components: { codemirror, draggable },
+  props: {
+    param: {// chart
+      type: Object,
+      required: true
+    },
+    field: {
+      type: Object,
+      required: true
+    },
+    mode: {
+      type: String,
+      required: false,
+      default: 'normal'
+    }
+  },
+  data() {
+    return {
+      fieldForm: {
+        id: null,
+        name: '',
+        groupType: 'd',
+        deType: 0,
+        originName: '',
+        tableId: this.param.tableId,
+        checked: 1,
+        columnIndex: 0,
+        size: 0,
+        extField: 2,
+        chartId: this.param.id
+      },
+      cmOption: {
+        tabSize: 2,
+        styleActiveLine: true,
+        lineNumbers: true,
+        line: true,
+        mode: 'text/x-sql',
+        theme: 'solarized',
+        hintOptions: { // 自定义提示选项
+          completeSingle: false // 当匹配只有一项的时候是否自动补全
+        }
+      },
+      fields: [
+        { label: this.$t('dataset.text'), value: 0 },
+        { label: this.$t('dataset.time'), value: 1 },
+        { label: this.$t('dataset.value'), value: 2 },
+        { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 },
+        { label: this.$t('dataset.location'), value: 5 }
+      ],
+      functions: [],
+      searchField: '',
+      searchFunction: '',
+      dimensionData: [],
+      quotaData: [],
+      functionData: [],
+      tableFields: {}
+    }
+  },
+  computed: {
+    codemirror() {
+      return this.$refs.myCm.codemirror
+    },
+    panelInfo() {
+      return this.$store.state.panel.panelInfo
+    }
+  },
+  watch: {
+    'param': function() {
+      this.initFunctions()
+    },
+    'field': {
+      handler: function() {
+        this.initField()
+      },
+      deep: true
+    },
+    'tableFields': function() {
+      this.dimensionData = JSON.parse(JSON.stringify(this.tableFields.dimensionList)).filter(ele => ele.extField === 0)
+      this.quotaData = JSON.parse(JSON.stringify(this.tableFields.quotaList)).filter(ele => ele.extField === 0)
+    },
+    'searchField': function(val) {
+      if (val && val !== '') {
+        this.dimensionData = JSON.parse(JSON.stringify(this.tableFields.dimensionList.filter(ele => ele.name.toLocaleLowerCase().includes(val.toLocaleLowerCase()) && ele.extField === 0)))
+        this.quotaData = JSON.parse(JSON.stringify(this.tableFields.quotaList.filter(ele => ele.name.toLocaleLowerCase().includes(val.toLocaleLowerCase()) && ele.extField === 0)))
+      } else {
+        this.dimensionData = JSON.parse(JSON.stringify(this.tableFields.dimensionList)).filter(ele => ele.extField === 0)
+        this.quotaData = JSON.parse(JSON.stringify(this.tableFields.quotaList)).filter(ele => ele.extField === 0)
+      }
+    },
+    'searchFunction': function(val) {
+      if (val && val !== '') {
+        this.functionData = JSON.parse(JSON.stringify(this.functions.filter(ele => {
+          return ele.func.toLocaleLowerCase().includes(val.toLocaleLowerCase())
+        })))
+      } else {
+        this.functionData = JSON.parse(JSON.stringify(this.functions))
+      }
+    }
+  },
+  mounted() {
+    this.$refs.myCm.codemirror.on('keypress', () => {
+      this.$refs.myCm.codemirror.showHint()
+    })
+    this.initFunctions()
+    this.initField()
+  },
+  methods: {
+    onCmReady(cm) {
+      this.codemirror.setSize('-webkit-fill-available', 'auto')
+    },
+    onCmFocus(cm) {
+    },
+    onCmCodeChange(newCode) {
+      this.fieldForm.originName = newCode
+    },
+    insertParamToCodeMirror(param) {
+      const pos1 = this.$refs.myCm.codemirror.getCursor()
+      const pos2 = {}
+      pos2.line = pos1.line
+      pos2.ch = pos1.ch
+      this.$refs.myCm.codemirror.replaceRange(param, pos2)
+    },
+    insertFieldToCodeMirror(param) {
+      const pos1 = this.$refs.myCm.codemirror.getCursor()
+      const pos2 = {}
+      pos2.line = pos1.line
+      pos2.ch = pos1.ch
+      this.$refs.myCm.codemirror.replaceRange(param, pos2)
+    },
+
+    initFunctions() {
+      post('/dataset/function/listByTableId/' + this.param.tableId, null).then(response => {
+        this.functions = response.data
+        this.functionData = JSON.parse(JSON.stringify(this.functions))
+
+        this.initDsFields()
+      })
+    },
+
+    initField() {
+      if (this.field.id || this.mode === 'copy') {
+        this.fieldForm = JSON.parse(JSON.stringify(this.field))
+      } else {
+        this.fieldForm = JSON.parse(JSON.stringify(this.fieldForm))
+      }
+    },
+
+    closeCalcField() {
+      this.resetField()
+      this.$emit('onEditClose', {})
+    },
+
+    saveCalcField() {
+      if (this.fieldForm.name && this.fieldForm.name.length > 50) {
+        this.$message.error(this.$t('dataset.field_name_less_50'))
+        return
+      }
+      if (!this.fieldForm.id) {
+        this.fieldForm.type = this.fieldForm.deType
+        this.fieldForm.deExtractType = this.fieldForm.deType
+        this.fieldForm.tableId = this.param.tableId
+        this.fieldForm.columnIndex = 0
+        this.fieldForm.chartId = this.param.id
+      }
+      post('/chart/field/save/' + this.panelInfo.id, this.fieldForm).then(response => {
+        this.closeCalcField()
+      })
+    },
+
+    resetField() {
+      this.fieldForm = {
+        id: null,
+        name: '',
+        groupType: 'd',
+        deType: 0,
+        originName: '',
+        tableId: this.param.tableId,
+        checked: 1,
+        columnIndex: 0,
+        size: 0,
+        extField: 2,
+        chartId: this.param.id
+      }
+      this.dimensionData = []
+      this.quotaData = []
+      this.searchField = ''
+      this.searchFunction = ''
+    },
+
+    initDsFields() {
+      post('/dataset/field/listByDQ/' + this.param.tableId, null).then(response => {
+        this.tableFields = response.data
+        this.tableFields.dimensionListData = JSON.parse(JSON.stringify(this.tableFields.dimensionList))
+        this.tableFields.quotaListData = JSON.parse(JSON.stringify(this.tableFields.quotaList))
+
+        this.dimensionData = JSON.parse(JSON.stringify(this.tableFields.dimensionList)).filter(ele => ele.extField === 0)
+        this.quotaData = JSON.parse(JSON.stringify(this.tableFields.quotaList)).filter(ele => ele.extField === 0)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.row-style >>> .el-form-item__label {
+  font-size: 12px;
+}
+
+.row-style >>> .el-form-item--mini.el-form-item {
+  margin-bottom: 10px;
+}
+
+.row-style >>> .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+}
+
+.codemirror {
+  height: 300px;
+  overflow-y: auto;
+  font-size: 12px;
+}
+
+.codemirror >>> .CodeMirror-scroll {
+  height: 300px;
+  overflow-y: auto;
+  font-size: 12px;
+}
+
+.padding-lr {
+  padding: 0 4px;
+}
+
+.field-height {
+  height: calc(50% - 25px);
+  margin-top: 4px;
+}
+
+.drag-list {
+  height: calc(100% - 26px);
+  overflow: auto;
+}
+
+.item-dimension {
+  padding: 2px 10px;
+  margin: 2px 2px 0 2px;
+  border: solid 1px #eee;
+  text-align: left;
+  color: #606266;
+  /*background-color: rgba(35,46,64,.05);*/
+  background-color: white;
+  display: block;
+  word-break: break-all;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.blackTheme .item-dimension {
+  border: solid 1px;
+  border-color: #495865;
+  color: #F2F6FC;
+  background-color: var(--MainBG);
+}
+
+.item-dimension + .item-dimension {
+  margin-top: 2px;
+}
+
+.item-dimension:hover {
+  color: #1890ff;
+  background: #e8f4ff;
+  border-color: #a3d3ff;
+  cursor: pointer;
+}
+
+.blackTheme .item-dimension:hover {
+  /* color: var(--Main); */
+  background: var(--ContentBG);
+  /* cursor: pointer; */
+}
+
+.item-quota {
+  padding: 2px 10px;
+  margin: 2px 2px 0 2px;
+  border: solid 1px #eee;
+  text-align: left;
+  color: #606266;
+  /*background-color: rgba(35,46,64,.05);*/
+  background-color: white;
+  display: block;
+  word-break: break-all;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.blackTheme .item-quota {
+
+  border: solid 1px;
+  border-color: #495865;
+  color: #F2F6FC;
+  background-color: var(--MainBG);
+
+}
+
+.item-quota + .item-quota {
+  margin-top: 2px;
+}
+
+.item-quota:hover {
+  color: #67c23a;
+  background: #f0f9eb;
+  border-color: #b2d3a3;
+  cursor: pointer;
+}
+
+.blackTheme .item-quota:hover {
+  background: var(--ContentBG);
+}
+
+span {
+  font-size: 12px;
+}
+
+.function-style {
+  color: #0a7be0;
+  display: block;
+  padding: 2px 4px;
+  cursor: pointer;
+  margin: 4px 0;
+  word-break: break-word;
+  border: solid 1px #eee;
+}
+
+.blackTheme .function-style {
+  border: solid 1px;
+  border-color: #495865;
+  color: #F2F6FC;
+  background-color: var(--MainBG);
+}
+
+.function-style:hover {
+  background: #e8f4ff;
+  border-color: #a3d3ff;
+  cursor: pointer;
+}
+
+.blackTheme .function-style:hover {
+  color: #1890ff;
+  background: var(--ContentBG);
+}
+
+.function-height {
+  height: calc(100% - 50px);
+  overflow: auto;
+  margin-top: 4px;
+}
+
+.function-pop >>> .el-popover {
+  padding: 6px !important;
+}
+
+.pop-title {
+  margin: 6px 0 0 0;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.pop-info {
+  margin: 6px 0 0 0;
+  font-size: 10px;
+}
+
+.dialog-button {
+  float: right;
+  margin-top: 10px;
+}
+</style>
diff --git a/frontend/src/views/chart/view/ChartFieldEdit.vue b/frontend/src/views/chart/view/ChartFieldEdit.vue
new file mode 100644
index 0000000000..836549c356
--- /dev/null
+++ b/frontend/src/views/chart/view/ChartFieldEdit.vue
@@ -0,0 +1,578 @@
+<template>
+  <el-row :style="{height: maxHeight,overflow:'auto'}">
+    <el-row>
+      <el-form :inline="true">
+        <el-form-item class="form-item">
+          <el-button size="mini" icon="el-icon-circle-plus-outline" @click="addCalcField">
+            {{ $t('dataset.add_calc_field') }}
+          </el-button>
+        </el-form-item>
+        <el-form-item class="form-item" style="float: right;margin-right: 0;">
+          <el-input
+            v-model="searchField"
+            size="mini"
+            :placeholder="$t('dataset.search')"
+            prefix-icon="el-icon-search"
+            clearable
+            class="main-area-input"
+          />
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-collapse v-model="fieldActiveNames" class="style-collapse">
+      <el-collapse-item name="d" :title="$t('chart.dimension')">
+        <el-table :data="tableFields.dimensionListData" size="mini">
+          <el-table-column property="name" :label="$t('dataset.field_name')" width="180">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.name"
+                size="mini"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                @blur="saveEdit(scope.row)"
+                @keyup.enter.native="saveEdit(scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column property="deType" :label="$t('dataset.field_type')" width="140">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.deType"
+                size="mini"
+                style="display: inline-block;width: 26px;"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                @change="saveEdit(scope.row)"
+              >
+                <el-option
+                  v-for="item in fields"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                  <span style="float: left">
+                    <svg-icon v-if="item.value === 0" icon-class="field_text" class="field-icon-text" />
+                    <svg-icon v-if="item.value === 1" icon-class="field_time" class="field-icon-time" />
+                    <svg-icon
+                      v-if="item.value === 2 || item.value === 3"
+                      icon-class="field_value"
+                      class="field-icon-value"
+                    />
+                    <svg-icon v-if="item.value === 5" icon-class="field_location" class="field-icon-location" />
+                  </span>
+                  <span style="float: left; color: #8492a6; font-size: 12px">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+              <span style="margin-left: 8px;">
+                <span v-if="scope.row.deType === 0 || scope.row.deType === 6">
+                  <svg-icon
+                    v-if="scope.row.deType === 0 || scope.row.deType === 6"
+                    icon-class="field_text"
+                    class="field-icon-text"
+                  />
+                  <span class="field-class">{{ $t('dataset.text') }}</span>
+                </span>
+                <span v-if="scope.row.deType === 1">
+                  <svg-icon v-if="scope.row.deType === 1" icon-class="field_time" class="field-icon-time" />
+                  <span class="field-class">{{ $t('dataset.time') }}</span>
+                </span>
+                <span v-if="scope.row.deType === 2 || scope.row.deType === 3">
+                  <svg-icon
+                    v-if="scope.row.deType === 2 || scope.row.deType === 3"
+                    icon-class="field_value"
+                    class="field-icon-value"
+                  />
+                  <span v-if="scope.row.deType === 2" class="field-class">{{ $t('dataset.value') }}</span>
+                  <span
+                    v-if="scope.row.deType === 3"
+                    class="field-class"
+                  >{{ $t('dataset.value') + '(' + $t('dataset.float') + ')' }}</span>
+                </span>
+                <span v-if="scope.row.deType === 5">
+                  <svg-icon v-if="scope.row.deType === 5" icon-class="field_location" class="field-icon-location" />
+                  <span class="field-class">{{ $t('dataset.location') }}</span>
+                </span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column property="deExtractType" :label="$t('dataset.origin_field_type')" width="100">
+            <template slot-scope="scope">
+              <span>
+                <span v-if="scope.row.deExtractType === 0 || scope.row.deExtractType === 6">
+                  <svg-icon
+                    v-if="scope.row.deExtractType === 0 || scope.row.deExtractType === 6"
+                    icon-class="field_text"
+                    class="field-icon-text"
+                  />
+                  <span class="field-class">{{ $t('dataset.text') }}</span>
+                </span>
+                <span v-if="scope.row.deExtractType === 1">
+                  <svg-icon v-if="scope.row.deExtractType === 1" icon-class="field_time" class="field-icon-time" />
+                  <span class="field-class">{{ $t('dataset.time') }}</span>
+                </span>
+                <span
+                  v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 3 || scope.row.deExtractType === 4"
+                >
+                  <svg-icon
+                    v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 3 || scope.row.deExtractType === 4"
+                    icon-class="field_value"
+                    class="field-icon-value"
+                  />
+                  <span
+                    v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 4"
+                    class="field-class"
+                  >{{ $t('dataset.value') }}</span>
+                  <span
+                    v-if="scope.row.deExtractType === 3"
+                    class="field-class"
+                  >{{ $t('dataset.value') + '(' + $t('dataset.float') + ')' }}</span>
+                </span>
+                <span v-if="scope.row.deExtractType === 5">
+                  <svg-icon
+                    v-if="scope.row.deExtractType === 5"
+                    icon-class="field_location"
+                    class="field-icon-location"
+                  />
+                  <span class="field-class">{{ $t('dataset.location') }}</span>
+                </span>
+              </span>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column property="groupType" :label="$t('dataset.field_group_type')" width="180">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-radio-group v-model="scope.row.groupType" size="mini">-->
+          <!--                <el-radio-button label="d">{{ $t('chart.dimension') }}</el-radio-button>-->
+          <!--                <el-radio-button label="q">{{ $t('chart.quota') }}</el-radio-button>-->
+          <!--              </el-radio-group>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column property="fromType" :label="$t('chart.form_type')" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.extField === 1" class="from-type-span">{{ $t('chart.copy_field') }}</span>
+              <span v-if="scope.row.extField === 2" class="from-type-span">{{ $t('chart.calc_field') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column property="groupType" :label="$t('dataset.d_q_trans')" width="120">
+            <template slot-scope="scope">
+              <el-button
+                icon="el-icon-sort"
+                size="mini"
+                circle
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                @click="dqTrans(scope.row,'d')"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column property="" :label="$t('dataset.operator')">
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.extField === 2"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                type="text"
+                size="mini"
+                @click="editField(scope.row)"
+              >{{ $t('dataset.edit') }}
+              </el-button>
+              <el-button
+                v-if="scope.row.extField !== 0"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                type="text"
+                size="mini"
+                @click="deleteField(scope.row)"
+              >{{ $t('dataset.delete') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-collapse-item>
+
+      <el-collapse-item name="q" :title="$t('chart.quota')">
+        <el-table :data="tableFields.quotaListData" size="mini">
+          <el-table-column property="name" :label="$t('dataset.field_name')" width="180">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.name"
+                size="mini"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                @blur="saveEdit(scope.row)"
+                @keyup.enter.native="saveEdit(scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column property="deType" :label="$t('dataset.field_type')" width="140">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.deType"
+                size="mini"
+                style="display: inline-block;width: 26px;"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                @change="saveEdit(scope.row)"
+              >
+                <el-option
+                  v-for="item in fields"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                  <span style="float: left">
+                    <svg-icon v-if="item.value === 0" icon-class="field_text" class="field-icon-text" />
+                    <svg-icon v-if="item.value === 1" icon-class="field_time" class="field-icon-time" />
+                    <svg-icon
+                      v-if="item.value === 2 || item.value === 3"
+                      icon-class="field_value"
+                      class="field-icon-value"
+                    />
+                    <svg-icon v-if="item.value === 5" icon-class="field_location" class="field-icon-location" />
+                  </span>
+                  <span style="float: left; color: #8492a6; font-size: 12px">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+              <span style="margin-left: 8px;">
+                <span v-if="scope.row.deType === 0">
+                  <svg-icon v-if="scope.row.deType === 0" icon-class="field_text" class="field-icon-text" />
+                  <span class="field-class">{{ $t('dataset.text') }}</span>
+                </span>
+                <span v-if="scope.row.deType === 1">
+                  <svg-icon v-if="scope.row.deType === 1" icon-class="field_time" class="field-icon-time" />
+                  <span class="field-class">{{ $t('dataset.time') }}</span>
+                </span>
+                <span v-if="scope.row.deType === 2 || scope.row.deType === 3">
+                  <svg-icon
+                    v-if="scope.row.deType === 2 || scope.row.deType === 3"
+                    icon-class="field_value"
+                    class="field-icon-value"
+                  />
+                  <span v-if="scope.row.deType === 2" class="field-class">{{ $t('dataset.value') }}</span>
+                  <span
+                    v-if="scope.row.deType === 3"
+                    class="field-class"
+                  >{{ $t('dataset.value') + '(' + $t('dataset.float') + ')' }}</span>
+                </span>
+                <span v-if="scope.row.deType === 5">
+                  <svg-icon v-if="scope.row.deType === 5" icon-class="field_location" class="field-icon-location" />
+                  <span class="field-class">{{ $t('dataset.location') }}</span>
+                </span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column property="deExtractType" :label="$t('dataset.origin_field_type')" width="100">
+            <template slot-scope="scope">
+              <span>
+                <span v-if="scope.row.deExtractType === 0">
+                  <svg-icon v-if="scope.row.deExtractType === 0" icon-class="field_text" class="field-icon-text" />
+                  <span class="field-class">{{ $t('dataset.text') }}</span>
+                </span>
+                <span v-if="scope.row.deExtractType === 1">
+                  <svg-icon v-if="scope.row.deExtractType === 1" icon-class="field_time" class="field-icon-time" />
+                  <span class="field-class">{{ $t('dataset.time') }}</span>
+                </span>
+                <span
+                  v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 3 || scope.row.deExtractType === 4"
+                >
+                  <svg-icon
+                    v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 3 || scope.row.deExtractType === 4"
+                    icon-class="field_value"
+                    class="field-icon-value"
+                  />
+                  <span
+                    v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 4"
+                    class="field-class"
+                  >{{ $t('dataset.value') }}</span>
+                  <span
+                    v-if="scope.row.deExtractType === 3"
+                    class="field-class"
+                  >{{ $t('dataset.value') + '(' + $t('dataset.float') + ')' }}</span>
+                </span>
+                <span v-if="scope.row.deExtractType === 5">
+                  <svg-icon
+                    v-if="scope.row.deExtractType === 5"
+                    icon-class="field_location"
+                    class="field-icon-location"
+                  />
+                  <span class="field-class">{{ $t('dataset.location') }}</span>
+                </span>
+              </span>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column property="groupType" :label="$t('dataset.field_group_type')" width="180">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-radio-group v-model="scope.row.groupType" size="mini">-->
+          <!--                <el-radio-button label="d">{{ $t('chart.dimension') }}</el-radio-button>-->
+          <!--                <el-radio-button label="q">{{ $t('chart.quota') }}</el-radio-button>-->
+          <!--              </el-radio-group>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column property="fromType" :label="$t('chart.form_type')" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.extField === 1" class="from-type-span">{{ $t('chart.copy_field') }}</span>
+              <span v-if="scope.row.extField === 2" class="from-type-span">{{ $t('chart.calc_field') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column property="groupType" :label="$t('dataset.d_q_trans')" width="120">
+            <template slot-scope="scope">
+              <el-button
+                icon="el-icon-sort"
+                size="mini"
+                circle
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                @click="dqTrans(scope.row,'q')"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column property="" :label="$t('dataset.operator')">
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.extField === 2"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                type="text"
+                size="mini"
+                @click="editField(scope.row)"
+              >{{ $t('dataset.edit') }}
+              </el-button>
+              <el-button
+                v-if="scope.row.extField !== 0"
+                :disabled="!hasDataPermission('manage',param.privileges)"
+                type="text"
+                size="mini"
+                @click="deleteField(scope.row)"
+              >{{ $t('dataset.delete') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-collapse-item>
+    </el-collapse>
+
+    <el-dialog
+      v-if="editCalcField"
+      v-dialogDrag
+      :visible="editCalcField"
+      :show-close="false"
+      class="dialog-css"
+      :title="currEditField.id?$t('dataset.edit_calc_field'):$t('dataset.add_calc_field')"
+      append-to-body
+    >
+      <calc-chart-field-edit
+        :param="param"
+        :field="currEditField"
+        @onEditClose="closeCalcField"
+      />
+    </el-dialog>
+  </el-row>
+</template>
+
+<script>
+import { post } from '@/api/dataset/dataset'
+import CalcChartFieldEdit from '@/views/chart/view/CalcChartFieldEdit'
+
+export default {
+  name: 'ChartFieldEdit',
+  components: { CalcChartFieldEdit },
+  props: {
+    param: {
+      type: Object,
+      required: true
+    },
+    table: {
+      type: Object,
+      required: true
+    },
+    chart: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      maxHeight: 'auto',
+      tableFields: {
+        dimensionList: [],
+        quotaList: [],
+        dimensionListData: [],
+        quotaListData: []
+      },
+      fields: [
+        { label: this.$t('dataset.text'), value: 0 },
+        { label: this.$t('dataset.time'), value: 1 },
+        { label: this.$t('dataset.value'), value: 2 },
+        { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 },
+        { label: this.$t('dataset.location'), value: 5 }
+      ],
+      fieldActiveNames: ['d', 'q'],
+      searchField: '',
+      editCalcField: false,
+      currEditField: {},
+      isSyncField: false
+    }
+  },
+  computed: {
+    panelInfo() {
+      return this.$store.state.panel.panelInfo
+    }
+  },
+  watch: {
+    'param': function() {
+      this.initField()
+    },
+    searchField(val) {
+      this.filterField(val)
+    }
+  },
+  mounted() {
+    window.onresize = () => {
+      this.calcHeight()
+    }
+    this.calcHeight()
+    this.initField()
+  },
+  methods: {
+    calcHeight() {
+      const that = this
+      setTimeout(function() {
+        const currentHeight = document.documentElement.clientHeight
+        that.maxHeight = (currentHeight - 56 - 30 - 35 - 26 - 10 - 10) + 'px'
+      }, 10)
+    },
+    initField() {
+      post('/chart/field/listByDQ/' + this.param.id + '/' + this.panelInfo.id, null).then(response => {
+        this.tableFields = response.data
+        this.tableFields.dimensionListData = JSON.parse(JSON.stringify(this.tableFields.dimensionList))
+        this.tableFields.quotaListData = JSON.parse(JSON.stringify(this.tableFields.quotaList))
+        this.filterField(this.searchField)
+      })
+    },
+    saveEdit(item) {
+      if (item.name && item.name.length > 50) {
+        this.$message.error(this.$t('dataset.field_name_less_50'))
+        return
+      }
+
+      post('/chart/field/save/' + this.panelInfo.id, item).then(response => {
+        this.initField()
+      }).catch(res => {
+        this.initField()
+      })
+    },
+
+    dqTrans(item, val) {
+      if (val === 'd') {
+        item.groupType = 'q'
+      } else if (val === 'q') {
+        item.groupType = 'd'
+      }
+      this.saveEdit(item)
+    },
+
+    addCalcField() {
+      this.currEditField = {}
+      this.editCalcField = true
+    },
+
+    closeCalcField() {
+      this.editCalcField = false
+      this.initField()
+    },
+
+    filterField(val) {
+      if (val && val !== '') {
+        this.tableFields.dimensionListData = JSON.parse(JSON.stringify(this.tableFields.dimensionListData.filter(ele => {
+          return ele.name.toLocaleLowerCase().includes(val.toLocaleLowerCase())
+        })))
+        this.tableFields.quotaListData = JSON.parse(JSON.stringify(this.tableFields.quotaList.filter(ele => {
+          return ele.name.toLocaleLowerCase().includes(val.toLocaleLowerCase())
+        })))
+      } else {
+        this.tableFields.dimensionListData = JSON.parse(JSON.stringify(this.tableFields.dimensionList))
+        this.tableFields.quotaListData = JSON.parse(JSON.stringify(this.tableFields.quotaList))
+      }
+    },
+
+    editField(item) {
+      this.currEditField = item
+      this.editCalcField = true
+    },
+
+    deleteField(item) {
+      this.$confirm(this.$t('dataset.confirm_delete'), this.$t('chart.tips'), {
+        confirmButtonText: this.$t('dataset.confirm'),
+        cancelButtonText: this.$t('dataset.cancel'),
+        type: 'warning'
+      }).then(() => {
+        post('/chart/field/delete/' + item.id + '/' + this.panelInfo.id, null).then(response => {
+          this.$message({
+            type: 'success',
+            message: this.$t('chart.delete_success'),
+            showClose: true
+          })
+          this.initField()
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-divider--horizontal {
+  margin: 12px 0;
+}
+
+span {
+  font-size: 14px;
+}
+
+.field-class {
+  font-size: 12px !important;
+}
+
+.el-select >>> input {
+  padding-right: 10px;
+}
+
+.el-select >>> .el-input__suffix {
+  right: 0;
+}
+
+.el-radio {
+  margin-right: 10px !important;
+}
+
+.style-collapse >>> .el-collapse-item__header {
+  height: 40px;
+  line-height: 40px;
+  padding: 0 0 0 10px;
+}
+
+.style-collapse >>> .el-collapse-item__wrap {
+  border-bottom: 0 solid #e6ebf5 !important;
+}
+
+.style-collapse {
+  border-top: 0 solid #e6ebf5 !important;
+}
+
+.form-item {
+  margin-bottom: 6px;
+}
+
+.dialog-css >>> .el-dialog__title {
+  font-size: 14px;
+}
+
+.dialog-css >>> .el-dialog__header {
+  padding: 20px 20px 0;
+}
+
+.dialog-css >>> .el-dialog__body {
+  padding: 10px 20px 20px;
+}
+
+.dialog-css >>> .el-dialog {
+  width: 800px !important;
+}
+
+.from-type-span{
+  font-size: 12px;
+  color: #c0c0c0;
+}
+</style>