From 91d1659b406fc5e1ea082898073d5af81edd73a4 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 20 Aug 2021 16:49:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=87=E6=A0=87=E5=8D=A1=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/normal/LabelNormal.vue    | 12 +++++++-----
 .../chart/components/shape-attr/ColorSelector.vue    |  6 +++---
 frontend/src/views/dataset/data/CalcFieldEdit.vue    | 11 +++++++++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue
index d0bbcbe3e2..1f5b9becdb 100644
--- a/frontend/src/views/chart/components/normal/LabelNormal.vue
+++ b/frontend/src/views/chart/components/normal/LabelNormal.vue
@@ -6,15 +6,17 @@
       id="label-content"
       :style="content_class"
     >
-      <span v-if="quotaShow" :style="label_space">
+      <span v-if="quotaShow" :style="label_class">
         <p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
           {{ item.data[0] }}
         </p>
       </span>
-      <p v-if="dimensionShow" :style="label_class">
-        <!--        {{ chart.data.x[0] }}-->
-        {{ chart.data.series[0].name }}
-      </p>
+      <span v-if="dimensionShow" :style="label_space">
+        <p :style="label_class">
+          <!--        {{ chart.data.x[0] }}-->
+          {{ chart.data.series[0].name }}
+        </p>
+      </span>
     </div>
   </div>
 </template>
diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
index 0ba06b3b66..f499f1cc66 100644
--- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
@@ -46,12 +46,12 @@
             </el-popover>
           </el-form-item>
 
-          <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
-            <el-color-picker v-model="colorForm.dimensionColor" class="color-picker-style" @change="changeColorCase" />
-          </el-form-item>
           <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">
             <el-color-picker v-model="colorForm.quotaColor" class="color-picker-style" @change="changeColorCase" />
           </el-form-item>
+          <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
+            <el-color-picker v-model="colorForm.dimensionColor" class="color-picker-style" @change="changeColorCase" />
+          </el-form-item>
         </div>
         <div v-if="sourceType==='view' || sourceType==='panelTable'">
           <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_header_bg')" class="form-item">
diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index 99b2eb0427..da5ec00115 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -86,7 +86,7 @@
               :disabled="true"
             >
               <transition-group>
-                <span v-for="item in dimensionData" :key="item.id" class="item-dimension" :title="item.name" @click="insertParamToCodeMirror('['+item.id+']')">
+                <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" />
@@ -106,7 +106,7 @@
               :disabled="true"
             >
               <transition-group>
-                <span v-for="item in quotaData" :key="item.id" class="item-quota" :title="item.name" @click="insertParamToCodeMirror('['+item.id+']')">
+                <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" />
@@ -314,6 +314,13 @@ export default {
       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.id, null).then(response => {