Merge pull request #351 from dataease/pr@dev@feat_字段管理多处优化，初步完成字段公式计算前端UI

frontend/src/lang/en.js

@@ -976,7 +976,16 @@ export default {
     right_join: 'RIGHT JOIN',
     inner_join: 'INNER JOIN',
     full_join: 'FULL JOIN',
-    can_not_union_diff_datasource: 'Union dataset must have same data source'
+    can_not_union_diff_datasource: 'Union dataset must have same data source',
+    operator: 'Operator',
+    d_q_trans: 'Dimension/Quota Transform',
+    add_calc_field: 'Create calc field',
+    input_name: 'Please input name',
+    field_exp: 'Field Expression',
+    data_type: 'Data Type',
+    click_ref_field: 'Click Quote Field',
+    click_ref_function: 'Click Quote Function',
+    field_manage: 'Field Manage'
   },
   datasource: {
     datasource: 'Data Source',

frontend/src/lang/tw.js

@@ -976,7 +976,16 @@ export default {
     right_join: '右連接',
     inner_join: '內連接',
     full_join: '全連接',
-    can_not_union_diff_datasource: '被關聯數據集必須與當前數據集的數據源一致'
+    can_not_union_diff_datasource: '被關聯數據集必須與當前數據集的數據源一致',
+    operator: '操作',
+    d_q_trans: '維度/指標轉換',
+    add_calc_field: '新建计算字段',
+    input_name: '請輸入名稱',
+    field_exp: '字段表達式',
+    data_type: '數據類型',
+    click_ref_field: '點擊引用字段',
+    click_ref_function: '點擊引用函數',
+    field_manage: '字段管理'
   },
   datasource: {
     datasource: '數據源',

frontend/src/lang/zh.js

@@ -976,7 +976,16 @@ export default {
     right_join: '右连接',
     inner_join: '内连接',
     full_join: '全连接',
-    can_not_union_diff_datasource: '被关联数据集必须与当前数据集的数据源一致'
+    can_not_union_diff_datasource: '被关联数据集必须与当前数据集的数据源一致',
+    operator: '操作',
+    d_q_trans: '维度/指标转换',
+    add_calc_field: '新建计算字段',
+    input_name: '请输入名称',
+    field_exp: '字段表达式',
+    data_type: '数据类型',
+    click_ref_field: '点击引用字段',
+    click_ref_function: '点击引用函数',
+    field_manage: '字段管理'
   },
   datasource: {
     datasource: '数据源',

frontend/src/views/chart/view/ChartEdit.vue

@@ -514,7 +514,7 @@
       :destroy-on-close="true"
       :fullscreen="true"
     >
-      <field-edit :param="{table:table}" @switchComponent="closeEditDsField" />
+      <field-edit :param="table" @switchComponent="closeEditDsField" />
     </el-dialog>
   </el-row>
 </template>

frontend/src/views/dataset/data/ViewTable.vue

@@ -34,9 +34,9 @@
         <el-button v-if="table.type ==='sql'" size="mini" @click="editSql">
           {{ $t('dataset.edit_sql') }}
         </el-button>
-        <el-button size="mini" @click="edit">
-          {{ $t('dataset.edit_field') }}
-        </el-button>
+        <!--        <el-button size="mini" @click="edit">-->
+        <!--          {{ $t('dataset.edit_field') }}-->
+        <!--        </el-button>-->
         <!--        <el-button size="mini" type="primary" @click="createChart">-->
         <!--          {{$t('dataset.create_view')}}-->
         <!--        </el-button>-->
@@ -44,10 +44,13 @@
     </el-row>
     <el-divider />
 
-    <el-tabs v-model="tabActive">
+    <el-tabs v-model="tabActive" @tab-click="initTable(param.id)">
       <el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
         <tab-data-preview :param="param" :table="table" :fields="fields" :data="data" :page="page" :form="tableViewRowForm" @reSearch="reSearch" />
       </el-tab-pane>
+      <el-tab-pane :label="$t('dataset.field_manage')" name="fieldEdit">
+        <field-edit :param="param" />
+      </el-tab-pane>
       <el-tab-pane v-if="table.type !== 'custom'" :label="$t('dataset.join_view')" name="joinView">
         <union-view :param="param" :table="table" />
       </el-tab-pane>
@@ -64,10 +67,11 @@ import TabDataPreview from './TabDataPreview'
 import UpdateInfo from './UpdateInfo'
 import DatasetChartDetail from '../common/DatasetChartDetail'
 import UnionView from './UnionView'
+import FieldEdit from './FieldEdit'
 
 export default {
   name: 'ViewTable',
-  components: { UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview },
+  components: { FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview },
   props: {
     param: {
       type: Object,
@@ -101,6 +105,7 @@ export default {
   },
   watch: {
     'param': function() {
+      this.tabActive = 'dataPreview'
       this.initTable(this.param.id)
     }
   },
@@ -112,7 +117,6 @@ export default {
   },
   methods: {
     initTable(id) {
-      this.tabActive = 'dataPreview'
       this.tableViewRowForm.row = 1000
       if (id !== null) {
         this.fields = []