Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5741,6 +5741,14 @@ const widgetTools = [
                 placeholder: '',
                 value: 20,
               },
+              {
+                type: 'el-slider',
+                label: '圆角',
+                name: 'radius',
+                require: false,
+                placeholder: '',
+                value: 5,
+              },
             ],
           },
           {
@@ -6210,7 +6218,7 @@ const widgetTools = [
               },
             ],
           },
-          /*{
+          {
             name: '自定义配色',
             list: [
               {
@@ -6221,7 +6229,7 @@ const widgetTools = [
                 value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
               },
             ],
-          },*/
+          },
         ],
       ],
       // 数据

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

@@ -48,7 +48,7 @@ export default {
             type: "bar",
             barGap: "0%",
             itemStyle: {
-              borderRadius: null
+              barBorderRadius: null
             }
           }
         ]
@@ -100,7 +100,7 @@ export default {
       this.setOptionsTooltip();
       this.setOptionsMargin();
       this.setOptionsLegend();
-      //this.setOptionsColor();
+      this.setOptionsColor();
       this.setOptionsData();
     },
     // 标题修改
@@ -255,7 +255,7 @@ export default {
       };
       legend.itemWidth = optionsCollapse.lengedWidth;
     },
-    // 图例颜色修改
+    // 自定义颜色
     setOptionsColor() {
       const optionsCollapse = this.optionsSetup;
       const customColor = optionsCollapse.customColor;
@@ -270,7 +270,7 @@ export default {
             return arrColor[params.dataIndex];
           },
           barBorderRadius : optionsCollapse.radius
-        }
+        },
       };
       for (const key in this.options.series) {
         if (this.options.series[key].type == "bar") {
@@ -311,6 +311,13 @@ export default {
     //静态数据
     staticDataFn(val) {
       const optionsSetup = this.optionsSetup;
+      //颜色
+      const customColor = optionsSetup.customColor;
+      const arrColor = [];
+      for (let i = 0; i < customColor.length; i++) {
+        arrColor.push(customColor[i].color);
+      }
+      //数据
       const series = [];
       let xAxisList = []
       let yAxisList = []
@@ -346,8 +353,12 @@ export default {
             color: optionsSetup.subTextColor,
             fontWeight: optionsSetup.fontWeight
           },
+          //颜色，圆角属性
           itemStyle: {
-            borderRadius: null
+            normal : {
+              color: arrColor[i],
+              barBorderRadius : optionsSetup.radius,
+            }
           }
         })
       }