修复图表数据异常

@CONTROL/数据图表 (新)/CONTROL-BASE.vue.ftl

@@ -347,13 +347,13 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
             Object.keys(this.seriesModel).forEach((seriesName:string) =>{
                 if(_chartOption && _chartOption.series.length > 0){
                     _chartOption.series.forEach((item:any) =>{
-                        if(this.seriesModel[seriesName].ecxObject){
+                        if(this.seriesModel[seriesName].ecxObject && Object.is(seriesName,item.id)){
                             item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecxObject);
                         }
-                        if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0){
+                        if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0  && Object.is(seriesName,item.id)){
                             item = Util.deepObjectMerge(item,this.seriesModel[seriesName].baseOption);
                         }
-                        if(this.seriesModel[seriesName].ecObject){
+                        if(this.seriesModel[seriesName].ecObject && Object.is(seriesName,item.id)){
                             item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecObject);
                         }
                     })

@CONTROL/数据图表/CONTROL-BASE.vue.ftl

@@ -347,13 +347,13 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
             Object.keys(this.seriesModel).forEach((seriesName:string) =>{
                 if(_chartOption && _chartOption.series.length > 0){
                     _chartOption.series.forEach((item:any) =>{
-                        if(this.seriesModel[seriesName].ecxObject){
+                        if(this.seriesModel[seriesName].ecxObject && Object.is(seriesName,item.id)){
                             item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecxObject);
                         }
-                        if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0){
+                        if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0  && Object.is(seriesName,item.id)){
                             item = Util.deepObjectMerge(item,this.seriesModel[seriesName].baseOption);
                         }
-                        if(this.seriesModel[seriesName].ecObject){
+                        if(this.seriesModel[seriesName].ecObject && Object.is(seriesName,item.id)){
                             item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecObject);
                         }
                     })