From fe0be547fd5bdb0740ff27f91e26173c7598b593 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 6 May 2022 16:11:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8D=E9=A2=9D=E5=A4=96=E6=98=BE=E7=A4=BA=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  4 +++-
 frontend/src/lang/tw.js                       |  4 +++-
 frontend/src/lang/zh.js                       |  4 +++-
 .../components/drag-item/DimensionExtItem.vue |  3 ++-
 .../components/drag-item/DimensionItem.vue    |  3 ++-
 .../components/drag-item/QuotaExtItem.vue     |  3 ++-
 .../chart/components/drag-item/QuotaItem.vue  |  3 ++-
 .../views/chart/components/drag-item/utils.js | 19 +++++++++++++++++++
 frontend/src/views/chart/view/ChartEdit.vue   | 17 ++++++++++++++---
 9 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 9b8f672b6e..3f136efd42 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -711,6 +711,7 @@ export default {
     var_pop: 'Variance',
     quick_calc: 'Fast calculation',
     show_name_set: 'Display name setting',
+    show_name: 'Display name',
     color: 'Color',
     color_case: 'Color Scheme',
     pls_slc_color_case: 'Please choose a color scheme',
@@ -1093,7 +1094,8 @@ export default {
     unit_million: 'Million',
     unit_hundred_million: 'Hundred Million',
     formatter_decimal_count_error: 'Range 0-10',
-    gauge_threshold_compare_error: 'Range must added'
+    gauge_threshold_compare_error: 'Range must added',
+    tick_count: 'Tick Split'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index b3e9cff3e2..9ffd87b0d8 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -713,6 +713,7 @@ export default {
     var_pop: '方差',
     quick_calc: '快速計算',
     show_name_set: '顯示名設置',
+    show_name: '顯示名',
     color: '顔色',
     color_case: '配色方案',
     pls_slc_color_case: '請選擇配色方案',
@@ -1093,7 +1094,8 @@ export default {
     unit_million: '百萬',
     unit_hundred_million: '億',
     formatter_decimal_count_error: '請輸入0-10的整數',
-    gauge_threshold_compare_error: '阈值範圍需逐級遞增'
+    gauge_threshold_compare_error: '阈值範圍需逐級遞增',
+    tick_count: '刻度間隔數'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index a62312874b..e464804e7e 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -715,6 +715,7 @@ export default {
     var_pop: '方差',
     quick_calc: '快速计算',
     show_name_set: '显示名设置',
+    show_name: '显示名',
     color: '颜色',
     color_case: '配色方案',
     pls_slc_color_case: '请选择配色方案',
@@ -1095,7 +1096,8 @@ export default {
     unit_million: '百万',
     unit_hundred_million: '亿',
     formatter_decimal_count_error: '请输入0-10的整数',
-    gauge_threshold_compare_error: '阈值范围需逐级递增'
+    gauge_threshold_compare_error: '阈值范围需逐级递增',
+    tick_count: '刻度间隔数'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
index b072cf59c0..16c51b2fb1 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import { getItemType } from '@/views/chart/components/drag-item/utils'
+import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
 import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
 import bus from '@/utils/bus'
 
@@ -192,6 +192,7 @@ export default {
     showRename() {
       this.item.index = this.index
       this.item.renameType = 'dimensionExt'
+      this.item.dsFieldName = getOriginFieldName(this.dimensionData, this.quotaData, this.item)
       this.$emit('onNameEdit', this.item)
     },
     removeItem() {
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index c76c6c22db..88dc78de22 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { getItemType } from '@/views/chart/components/drag-item/utils'
+import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
 import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
 import bus from '@/utils/bus'
 import { formatterItem } from '@/views/chart/chart/formatter'
@@ -214,6 +214,7 @@ export default {
     showRename() {
       this.item.index = this.index
       this.item.renameType = 'dimension'
+      this.item.dsFieldName = getOriginFieldName(this.dimensionData, this.quotaData, this.item)
       this.$emit('onNameEdit', this.item)
     },
     removeItem() {
diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
index 3fef5474e6..7dc42f8ffd 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
@@ -116,7 +116,7 @@
 
 <script>
 import { compareItem } from '@/views/chart/chart/compare'
-import { getItemType } from '@/views/chart/components/drag-item/utils'
+import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
 import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
 import bus from '@/utils/bus'
 import { formatterItem } from '@/views/chart/chart/formatter'
@@ -285,6 +285,7 @@ export default {
     showRename() {
       this.item.index = this.index
       this.item.renameType = 'quotaExt'
+      this.item.dsFieldName = getOriginFieldName(this.dimensionData, this.quotaData, this.item)
       this.$emit('onNameEdit', this.item)
     },
     removeItem() {
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 6f031c38d9..d745e66ab3 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -116,7 +116,7 @@
 
 <script>
 import { compareItem } from '@/views/chart/chart/compare'
-import { getItemType } from '@/views/chart/components/drag-item/utils'
+import { getItemType, getOriginFieldName } from '@/views/chart/components/drag-item/utils'
 import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
 import bus from '@/utils/bus'
 import { formatterItem } from '@/views/chart/chart/formatter'
@@ -281,6 +281,7 @@ export default {
     showRename() {
       this.item.index = this.index
       this.item.renameType = 'quota'
+      this.item.dsFieldName = getOriginFieldName(this.dimensionData, this.quotaData, this.item)
       this.$emit('onNameEdit', this.item)
     },
     removeItem() {
diff --git a/frontend/src/views/chart/components/drag-item/utils.js b/frontend/src/views/chart/components/drag-item/utils.js
index aac6d81f90..675abee608 100644
--- a/frontend/src/views/chart/components/drag-item/utils.js
+++ b/frontend/src/views/chart/components/drag-item/utils.js
@@ -36,3 +36,22 @@ export function getItemType(dimensionData, quotaData, item) {
     return 'danger'
   }
 }
+
+export function getOriginFieldName(dimensionList, quotaList, field) {
+  let originName = ''
+  for (let i = 0; i < dimensionList.length; i++) {
+    const item = dimensionList[i]
+    if (item.id === field.id) {
+      originName = item.name
+      break
+    }
+  }
+  for (let i = 0; i < quotaList.length; i++) {
+    const item = quotaList[i]
+    if (item.id === field.id) {
+      originName = item.name
+      break
+    }
+  }
+  return originName
+}
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index ea098c9aae..18cc72fb0c 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1026,9 +1026,12 @@
 
     <!--显示名修改-->
     <el-dialog v-dialogDrag :title="$t('chart.show_name_set')" :visible="renameItem" :show-close="false" width="30%">
-      <el-form ref="itemForm" :model="itemForm" :rules="itemFormRules">
-        <el-form-item :label="$t('commons.name')" prop="name">
-          <el-input v-model="itemForm.name" size="mini" clearable />
+      <el-form ref="itemForm" label-width="80px" :model="itemForm" :rules="itemFormRules">
+        <el-form-item :label="$t('dataset.field_origin_name')" class="form-item">
+          <span style="padding: 0 16px;">{{ itemForm.dsFieldName }}</span>
+        </el-form-item>
+        <el-form-item :label="$t('chart.show_name')" class="form-item">
+          <el-input v-model="itemForm.name" style="width: 200px" size="mini" clearable />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -3038,4 +3041,12 @@ span {
   height: 100%;
 }
 
+.form-item-slider>>>.el-form-item__label{
+  font-size: 12px;
+  line-height: 38px;
+}
+.form-item>>>.el-form-item__label{
+  font-size: 12px;
+}
+
 </style>