堆叠图样式更新

report-ui/src/views/report/bigscreen/designer/tools.js

@@ -6136,12 +6136,12 @@ const widgetTools = [
               },
             ],
           },
-          /*{
+          {
             name: '图例操作',
             list: [
               {
                 type: 'el-switch',
-                label: '图例',
+                label: '显示',
                 name: 'isShowLegend',
                 required: false,
                 placeholder: '',
@@ -6209,7 +6209,7 @@ const widgetTools = [
                 value: 'horizontal'
               },
             ],
-          },*/
+          },
           /*{
             name: '自定义配色',
             list: [

report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue

@@ -98,8 +98,8 @@ export default {
       this.setOptionsY();
       this.setOptionsTop();
       this.setOptionsTooltip();
-      //this.setOptionsMargin();
+      this.setOptionsMargin();
-      //this.setOptionsLegend();
+      this.setOptionsLegend();
       //this.setOptionsColor();
       this.setOptionsData();
     },
@@ -121,7 +121,6 @@ export default {
         fontWeight: optionsCollapse.subTextFontWeight,
         fontSize: optionsCollapse.subTextFontSize
       };
-
       this.options.title = title;
     },
     // X轴设置
@@ -245,15 +244,14 @@ export default {
       const optionsCollapse = this.optionsSetup;
       const legend = this.options.legend;
       legend.show = optionsCollapse.isShowLegend;
-      legend.left = optionsCollapse.lateralPosition == "left" ? 0 : "auto";
+      legend.left = optionsCollapse.lateralPosition;
-      legend.right = optionsCollapse.lateralPosition == "right" ? 0 : "auto";
       legend.top = optionsCollapse.longitudinalPosition == "top" ? 0 : "auto";
       legend.bottom =
         optionsCollapse.longitudinalPosition == "bottom" ? 0 : "auto";
       legend.orient = optionsCollapse.layoutFront;
       legend.textStyle = {
         color: optionsCollapse.lengedColor,
-        fontSize: optionsCollapse.fontSize
+        fontSize: optionsCollapse.lengedFontSize
       };
       legend.itemWidth = optionsCollapse.lengedWidth;
     },
@@ -302,7 +300,7 @@ export default {
       return newArr;
     },
     //获取堆叠样式
-    getStackStyle(){
+    getStackStyle() {
       const optionsSetup = this.optionsSetup;
       let style = ""
       if (optionsSetup.stackStyle == "upDown") {
@@ -339,8 +337,8 @@ export default {
           data: data,
           barGap: "0%",
           stack: this.getStackStyle(),
-          barWidth : optionsSetup.maxWidth,
+          barWidth: optionsSetup.maxWidth,
-          label : {
+          label: {
             show: optionsSetup.isShow,
             position: "top",
             distance: 10,