Merge pull request #1925 from dataease/pr@dev@feat_label

frontend/src/views/chart/components/normal/LabelNormalText.vue

@@ -11,12 +11,11 @@
           {{ chart.data.series[0].data[0] }}
         </p>
       </span>
-      <!--      字段名暂时隐藏-->
-      <!--      <span v-if="dimensionShow" :style="label_space">-->
-      <!--        <p :style="label_class">-->
-      <!--          {{ chart.data.datas[0].category }}-->
-      <!--        </p>-->
-      <!--      </span>-->
+      <span v-if="dimensionShow" :style="label_space">
+        <p :style="label_class">
+          {{ chart.data.series[0].name }}
+        </p>
+      </span>
     </div>
   </div>
 </template>

frontend/src/views/chart/components/shape-attr/ColorSelector.vue

@@ -48,7 +48,7 @@
           <el-form-item v-show="(chart.type && (chart.type.includes('text') || chart.type === 'label')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">
             <el-color-picker v-model="colorForm.quotaColor" class="color-picker-style" :predefine="predefineColors" @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-form-item v-show="(chart.type && chart.type.includes('text') || chart.type === 'label') || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
             <el-color-picker v-model="colorForm.dimensionColor" class="color-picker-style" :predefine="predefineColors" @change="changeColorCase" />
           </el-form-item>
         </div>

frontend/src/views/chart/components/shape-attr/SizeSelector.vue

@@ -133,15 +133,15 @@
             <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
           </el-select>
         </el-form-item>
-        <el-form-item v-show="chart.type && (chart.type.includes('text'))" :label="$t('chart.dimension_show')" class="form-item">
+        <el-form-item v-show="chart.type" :label="$t('chart.dimension_show')" class="form-item">
           <el-checkbox v-model="sizeForm.dimensionShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
-        <el-form-item v-show="chart.type && (chart.type.includes('text'))" :label="$t('chart.dimension_font_size')" class="form-item">
+        <el-form-item v-show="chart.type" :label="$t('chart.dimension_font_size')" class="form-item">
           <el-select v-model="sizeForm.dimensionFontSize" :placeholder="$t('chart.dimension_font_size')" @change="changeBarSizeCase">
             <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
           </el-select>
         </el-form-item>
-        <el-form-item v-show="chart.type && (chart.type.includes('text'))" :label="$t('chart.space_split')" class="form-item">
+        <el-form-item v-show="chart.type" :label="$t('chart.space_split')" class="form-item">
           <el-input-number v-model="sizeForm.spaceSplit" size="mini" @change="changeBarSizeCase" />
         </el-form-item>
       </el-form>

frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue

@@ -159,15 +159,15 @@
             <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
           </el-select>
         </el-form-item>
-        <el-form-item v-show="chart.type && (chart.type.includes('text'))" :label="$t('chart.dimension_show')" class="form-item">
+        <el-form-item v-show="chart.type" :label="$t('chart.dimension_show')" class="form-item">
           <el-checkbox v-model="sizeForm.dimensionShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
-        <el-form-item v-show="chart.type && (chart.type.includes('text'))" :label="$t('chart.dimension_font_size')" class="form-item">
+        <el-form-item v-show="chart.type" :label="$t('chart.dimension_font_size')" class="form-item">
           <el-select v-model="sizeForm.dimensionFontSize" :placeholder="$t('chart.dimension_font_size')" @change="changeBarSizeCase">
             <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
           </el-select>
         </el-form-item>
-        <el-form-item v-show="chart.type && (chart.type.includes('text'))" :label="$t('chart.space_split')" class="form-item">
+        <el-form-item v-show="chart.type" :label="$t('chart.space_split')" class="form-item">
           <el-input-number v-model="sizeForm.spaceSplit" size="mini" @change="changeBarSizeCase" />
         </el-form-item>
       </el-form>

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

@@ -2882,11 +2882,11 @@ span {
 }
 
 ::v-deep .el-slider__input {
-  width: 80px !important;
+  width: 100px !important;
 }
 
 ::v-deep .el-input-number--mini {
-  width: 80px !important;
+  width: 100px !important;
 }
 
 .no-senior {