图表调整

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 柱状图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,9 +9,9 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'bar',
-    xAxisIndex:${item.getIndex()},
-    yAxisIndex:${item.getIndex()},
-    datasetIndex:${item.getIndex()},
+    xAxisIndex:<@getXIndex item />,
+    yAxisIndex:<@getYIndex item />,
+    datasetIndex:<@getDataSetIndex item />,
     encode: {
         <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
         x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],      

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 折线图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,7 +9,7 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'funnel',
-    datasetIndex:${item.getIndex()},
+    datasetIndex:<@getDataSetIndex item />,
     <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
     <#if item.getTop()??>top:"${item.getTop()}",</#if>
     <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 折线图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,9 +9,9 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'line',
-    xAxisIndex:${item.getIndex()},
-    yAxisIndex:${item.getIndex()},
-    datasetIndex:${item.getIndex()},
+    xAxisIndex:<@getXIndex item />,
+    yAxisIndex:<@getYIndex item />,
+    datasetIndex:<@getDataSetIndex item />,
     encode: {
         <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
         x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],      

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 折线图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,8 +9,8 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'pie',
-    datasetIndex:${item.getIndex()},
-    <#compress><#if item.getLeft()?? && item.getLeft() != "">left:"${item.getLeft()}",</#if>
+    datasetIndex:<@getDataSetIndex item />,
+    <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
     <#if item.getTop()??>top:"${item.getTop()}",</#if>
     <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>
     <#if item.getRight()??>right:"${item.getRight()}",</#if>

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

+<#-- 获取序列映射X轴的索引start-->
+<#macro getXIndex item>
+<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
+<#assign chartCoordinateSystem =  item.getPSChartCoordinateSystem() />
+<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0()??>
+${chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0().getIndex()}<#else>0</#if>
+</#if>
+</#macro>
+<#-- 获取序列映射X轴的索引end-->
+
+<#-- 获取序列映射Y轴的索引start-->
+<#macro getYIndex item>
+<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
+<#assign chartCoordinateSystem =  item.getPSChartCoordinateSystem() />
+<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0()??>
+${chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0().getIndex()}<#else>0</#if>
+</#if>
+</#macro>
+<#-- 获取序列映射Y轴的索引end-->
+
+<#-- 获取序列映射数据集的索引start-->
+<#macro getDataSetIndex item>
+<#if item.getPSChartDataSet?? && item.getPSChartDataSet()??>
+<#assign chartDataSet =  item.getPSChartDataSet() />
+${chartDataSet.getIndex()}<#else>0
+</#if>
+</#macro>
+<#-- 获取序列映射数据集的索引end-->
\ No newline at end of file

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 柱状图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,9 +9,9 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'bar',
-    xAxisIndex:${item.getIndex()},
-    yAxisIndex:${item.getIndex()},
-    datasetIndex:${item.getIndex()},
+    xAxisIndex:<@getXIndex item />,
+    yAxisIndex:<@getYIndex item />,
+    datasetIndex:<@getDataSetIndex item />,
     encode: {
         <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
         x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],      

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 折线图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,7 +9,7 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'funnel',
-    datasetIndex:${item.getIndex()},
+    datasetIndex:<@getDataSetIndex item />,
     <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
     <#if item.getTop()??>top:"${item.getTop()}",</#if>
     <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 折线图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,9 +9,9 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'line',
-    xAxisIndex:${item.getIndex()},
-    yAxisIndex:${item.getIndex()},
-    datasetIndex:${item.getIndex()},
+    xAxisIndex:<@getXIndex item />,
+    yAxisIndex:<@getYIndex item />,
+    datasetIndex:<@getDataSetIndex item />,
     encode: {
         <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
         x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],      

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

+<#ibizinclude>
+./CONTROL-COMMON.vue.ftl
+</#ibizinclude>
 <#-- 折线图序列start -->
 <#if item.render??>
 ${item.render.code}
@@ -6,7 +9,7 @@ ${item.render.code}
     id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
     name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
     type:'pie',
-    datasetIndex:${item.getIndex()},
+    datasetIndex:<@getDataSetIndex item />,
     <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
     <#if item.getTop()??>top:"${item.getTop()}",</#if>
     <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>

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

+<#-- 获取序列映射X轴的索引start-->
+<#macro getXIndex item>
+<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
+<#assign chartCoordinateSystem =  item.getPSChartCoordinateSystem() />
+<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0()??>
+${chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0().getIndex()}<#else>0</#if>
+</#if>
+</#macro>
+<#-- 获取序列映射X轴的索引end-->
+
+<#-- 获取序列映射Y轴的索引start-->
+<#macro getYIndex item>
+<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
+<#assign chartCoordinateSystem =  item.getPSChartCoordinateSystem() />
+<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0()??>
+${chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0().getIndex()}<#else>0</#if>
+</#if>
+</#macro>
+<#-- 获取序列映射Y轴的索引end-->
+
+<#-- 获取序列映射数据集的索引start-->
+<#macro getDataSetIndex item>
+<#if item.getPSChartDataSet?? && item.getPSChartDataSet()??>
+<#assign chartDataSet =  item.getPSChartDataSet() />
+${chartDataSet.getIndex()}<#else>0
+</#if>
+</#macro>
+<#-- 获取序列映射数据集的索引end-->
\ No newline at end of file