shanbinzhang пре 1 месец
родитељ
комит
c834920f8a
1 измењених фајлова са 19 додато и 6 уклоњено
  1. 19 6
      src/hooks/chart/render.js

+ 19 - 6
src/hooks/chart/render.js

@@ -1389,18 +1389,31 @@ function setStackOrCombinChart(e){
         let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item) : {};
         //图表可配置的线条数就10条,第11条用第1条的配置,索引取下模
         const lineIndex = chartTheme ? index%chartTheme.lineOptionList.length : index;
-        let stacking = e.ChartInfo.ChartType==6
-            ? !e.DataResp.IsHeap?undefined:'normal'
-            : (e.ChartInfo.ChartType==3&&ExtraConfig.IsHeap==1)?ExtraConfig.HeapWay==1?'normal':'percent':undefined;
+
+        //堆叠控制
+        let stacking = undefined;
+        if(e.ChartInfo.ChartType===4) {
+            stacking = 'normal';
+        }else if(e.ChartInfo.ChartType===6) {
+            stacking = !e.DataResp.IsHeap ? undefined:'normal';
+        }else if(e.ChartInfo.ChartType===3&&ExtraConfig.IsHeap) {
+            stacking = ExtraConfig.HeapWay===1?'normal':'percent';
+        }
+
+        let type = chartStyle || item.ChartStyle;
+        if(e.ChartInfo.ChartType === 3) {
+            type = ExtraConfig.IsHeap==1 
+                ? 'area'
+                : (chartTheme && chartTheme.lineOptionList[lineIndex].lineType) || item.ChartStyle
+        }
+
 
         let seriesItemObj={
             data:[],
             dataGrouping:{
                 enabled:false
             },
-            type: e.ChartInfo.ChartType !== 3
-                ? (chartStyle || item.ChartStyle)
-                : ExtraConfig.IsHeap==1?'area':((chartTheme && chartTheme.lineOptionList[lineIndex].lineType) || item.ChartStyle),
+            type,
             yAxis:serie_yIndex,
             name:temName,
             nameZh:temName,