update

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

@@ -4,8 +4,8 @@
 new ChartLineSeries({
     name:'${item.name?lower_case}',
     <#if item.getIdField()??>seriesIdField:"${item.getIdField()?lower_case}",</#if>
-    <#if item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
-    categorField:'${item.getCatalogField()?lower_case}',
+    <#if item.getSeriesField?? && item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
+    categorField:' <#if item.getCatalogField?? && item.getCatalogField()??>${item.getCatalogField()?lower_case}</#if>',
     <#if item.getCatalogPSCodeList()??><#assign categorCodeList = item.getCatalogPSCodeList() />categorCodeList:{type:'${categorCodeList.getCodeListType()}',tag:'${categorCodeList.getCodeName()}',emptycode:'empty',emptytext:'${categorCodeList.getEmptyText()}'},</#if>
     valueField:'${item.getValueField()?lower_case}',
     seriesValues:[],
@@ -94,8 +94,8 @@ new ChartLineSeries({
 new ChartFunnelSeries({
     name:'${item.name?lower_case}',
     <#if item.getIdField()??>seriesIdField:"${item.getIdField()?lower_case}",</#if>
-    <#if item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
-    categorField:'${item.getCatalogField()?lower_case}',
+    <#if item.getSeriesField?? && item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
+    categorField:'<#if item.getCatalogField?? && item.getCatalogField()??>${item.getCatalogField()?lower_case}</#if>',
     <#if item.getCatalogPSCodeList()??><#assign categorCodeList = item.getCatalogPSCodeList() />categorCodeList:{type:'${categorCodeList.getCodeListType()}',tag:'${categorCodeList.getCodeName()}',emptycode:'empty',emptytext:'${categorCodeList.getEmptyText()}'},</#if>
     valueField:'${item.getValueField()?lower_case}',
     seriesValues:[],
@@ -184,8 +184,8 @@ new ChartFunnelSeries({
 new ChartPieSeries({
     name:'${item.name?lower_case}',
     <#if item.getIdField()??>seriesIdField:"${item.getIdField()?lower_case}",</#if>
-    <#if item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
-    categorField:'${item.getCatalogField()?lower_case}',
+    <#if item.getSeriesField?? && item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
+    categorField:'<#if item.getCatalogField?? && item.getCatalogField()??>${item.getCatalogField()?lower_case}</#if>',
     <#if item.getCatalogPSCodeList()??><#assign categorCodeList = item.getCatalogPSCodeList() />categorCodeList:{type:'${categorCodeList.getCodeListType()}',tag:'${categorCodeList.getCodeName()}',emptycode:'empty',emptytext:'${categorCodeList.getEmptyText()}'},</#if>
     valueField:'${item.getValueField()?lower_case}',
     seriesValues:[],
@@ -275,8 +275,8 @@ new ChartPieSeries({
 new ChartBarSeries({
     name:'${item.name?lower_case}',
     <#if item.getIdField()??>seriesIdField:"${item.getIdField()?lower_case}",</#if>
-    <#if item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
-    categorField:'${item.getCatalogField()?lower_case}',
+    <#if item.getSeriesField?? && item.getSeriesField()??>seriesNameField:"${item.getSeriesField()?lower_case}",</#if>
+    categorField:'<#if item.getCatalogField?? && item.getCatalogField()??>${item.getCatalogField()?lower_case}</#if>',
     <#if item.getCatalogPSCodeList()??><#assign categorCodeList = item.getCatalogPSCodeList() />categorCodeList:{type:'${categorCodeList.getCodeListType()}',tag:'${categorCodeList.getCodeName()}',emptycode:'empty',emptytext:'${categorCodeList.getEmptyText()}'},</#if>
     valueField:'${item.getValueField()?lower_case}',
     seriesValues:[],
@@ -362,7 +362,7 @@ new ChartBarSeries({
     seriesLayoutBy:"${item.getSeriesLayoutBy()}"
     })
 <#else>
-new ChartLineSeries({name:'${item.name?lower_case}',categorField:'${item.getCatalogField()?lower_case}',<#if item.getCatalogPSCodeList()??><#assign categorCodeList = item.getCatalogPSCodeList() />categorCodeList:{type:'${categorCodeList.getCodeListType()}',tag:'${categorCodeList.getCodeName()}'},</#if>valueField:'${item.getValueField()?lower_case}',data:[]}),
+new ChartLineSeries({name:'${item.name?lower_case}',categorField:'<#if item.getCatalogField?? && item.getCatalogField()??>${item.getCatalogField()?lower_case}</#if>',<#if item.getCatalogPSCodeList()??><#assign categorCodeList = item.getCatalogPSCodeList() />categorCodeList:{type:'${categorCodeList.getCodeListType()}',tag:'${categorCodeList.getCodeName()}'},</#if>valueField:'${item.getValueField()?lower_case}',data:[]}),
 </#if>
 </#if>
 <#-- 序列模型end -->
\ No newline at end of file