Merge pull request #537 from dataease/pr@dev@refactor_指标卡样式选项优化

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

@@ -6,15 +6,15 @@
       id="label-content"
       :style="content_class"
     >
-      <p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
-        {{ item.data[0] }}
-      </p>
       <span v-if="quotaShow" :style="label_space">
-        <p v-if="dimensionShow" :style="label_class">
-          <!--        {{ chart.data.x[0] }}-->
-          {{ chart.data.series[0].name }}
+        <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>
     </div>
   </div>
 </template>

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

@@ -115,14 +115,6 @@
       </el-form>
 
       <el-form v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="100px" size="mini">
-        <el-form-item :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 :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 :label="$t('chart.quota_show')" class="form-item">
           <el-checkbox v-model="sizeForm.quotaShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
@@ -131,6 +123,14 @@
             <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
           </el-select>
         </el-form-item>
+        <el-form-item :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 :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 :label="$t('chart.space_split')" class="form-item">
           <el-input-number v-model="sizeForm.spaceSplit" size="mini" @change="changeBarSizeCase" />
         </el-form-item>