修复图表加载逻辑

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

@@ -300,7 +300,10 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
-        Object.assign(arg,{viewparams:this.viewparams,page:0,size:1000});
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
+        Object.assign(arg,{page:0,size:1000});
         <#if ctrl.getPSDEDataSet()??>
         <#assign appDataSet = ctrl.getPSDEDataSet() />
         <#if appDataSet.getMajorSortDir()?? && appDataSet.getMajorSortPSDEField()??>

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

@@ -300,7 +300,10 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
-        Object.assign(arg,{viewparams:this.viewparams,page:0,size:1000});
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
+        Object.assign(arg,{page:0,size:1000});
         <#if ctrl.getPSDEDataSet()??>
         <#assign appDataSet = ctrl.getPSDEDataSet() />
         <#if appDataSet.getMajorSortDir()?? && appDataSet.getMajorSortPSDEField()??>