From 87c4e50bcf08a2ecb509376e0a58ec9deb1de620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=AC=A3?= <xin.huang@ribo.com.cn>
Date: Tue, 23 Nov 2021 09:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=89=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/zh.js                                     | 1 +
 .../src/views/chart/components/drag-item/DimensionItem.vue  | 6 +++++-
 frontend/src/views/chart/components/table/TableNormal.vue   | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index edd6b3c..84972f7 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -877,6 +877,7 @@ export default {
     drag_block_type_axis: '类别轴',
     drag_block_value_axis: '值轴',
     drag_block_table_data_column: '数据列',
+    drag_block_table_data_row: '数据行',
     drag_block_pie_angel: '扇区角度',
     drag_block_pie_label: '扇区标签',
     drag_block_gauge_angel: '指针角度',
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index acbc047..c69a5a4 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -26,7 +26,7 @@
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
         </el-tag>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item>
+          <el-dropdown-item v-if="showSort">
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="sort">
               <span class="el-dropdown-link inner-dropdown-menu">
                 <span>
@@ -111,6 +111,10 @@ export default {
     index: {
       type: Number,
       required: true
+    },
+    showSort: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index 4297eaa..7bc01b6 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -17,8 +17,8 @@
         :summary-method="summaryMethod"
       >
         <ux-table-column
-          v-for="field in fields"
-          :key="Math.random()"
+          v-for="(field, index) in fields"
+          :key="index"
           :field="field.dataeaseName"
           :resizable="true"
           sortable
@@ -162,6 +162,7 @@ export default {
       const that = this
       let datas = []
       if (this.chart.data) {
+        console.log(this.chart)
         this.fields = JSON.parse(JSON.stringify(this.chart.data.fields))
         datas = JSON.parse(JSON.stringify(this.chart.data.tableRow))
         if (this.chart.type === 'table-info') {