新图表

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

+<#-- 绘图极坐标系的角度轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      min: 0,
+      max: 360,
+      interval: 30,
+      startAngle: 45
+      
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图X轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
+      position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
+      type:<#if item.getType()??>'${item.getType()}'<#else>'category'</#if>,
+      name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
+      <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
+      <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>
+      <#if item.getBaseOptionJOString()??>
+      ${item.getBaseOptionJOString()}
+      </#if>
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图极坐标系的径向轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      min: 0,
+      max: 10,
+      interval: 2
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图平行坐标系 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图单轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图Y轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
+      position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
+      type:<#if item.getType()?? &&  item.getType() == 'numeric'>'value'<#else>'${item.getType()}'</#if>,
+      name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
+      <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
+      <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>
+      <#if item.getBaseOptionJOString()??>
+      ${item.getBaseOptionJOString()}
+      </#if>
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图X轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
+      position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
+      type:<#if item.getType()??>'${item.getType()}'<#else>'category'</#if>,
+      name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
+      <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
+      <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>
+      <#if item.getBaseOptionJOString()??>
+      ${item.getBaseOptionJOString()}
+      </#if>
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图Y轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
+      position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
+      type:<#if item.getType()?? &&  item.getType() == 'numeric'>'value'<#else>'${item.getType()}'</#if>,
+      name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
+      <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
+      <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>
+      <#if item.getBaseOptionJOString()??>
+      ${item.getBaseOptionJOString()}
+      </#if>
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图网格start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+<#if item.getBaseOptionJOString()??>
+${item.getBaseOptionJOString()}
+</#if>
+}
+</#if>
+<#-- 绘图网格end -->
\ No newline at end of file

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

+<#-- 柱状图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    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()},
+    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>],      
+        y: [<#if chartSeriesEncode.getY()??><#list chartSeriesEncode.getY() as yValue>'${yValue?lower_case}'<#if yValue_has_next>,</#if></#list></#if>]
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 柱状图序列end -->
\ No newline at end of file

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

+<#-- 折线图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
+    name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
+    type:'funnel',
+    datasetIndex:${item.getIndex()},
+    <#compress><#if item.getLeft()?? && item.getLeft() != "">left:"${item.getLeft()}",</#if>
+    <#if item.getTop()?? && item.getTop() != 0>top:"${item.getTop()}",</#if>
+    <#if item.getBottom()?? && item.getBottom() != 0>bottom:"${item.getBottom()}",</#if>
+    <#if item.getRight()?? && item.getRight() != "">right:"${item.getRight()}",</#if>
+    <#if item.getWidth()?? && item.getWidth() != "">width:"${item.getWidth()}",</#if>
+    <#if item.getHeight()?? && item.getHeight() != "">height:"${item.getHeight()}",</#if>
+    <#if item.getMinValue()?? && item.getMinValue() != 0 >min:"${item.getMinValue()}",</#if>
+    <#if item.getMaxValue()?? && item.getMaxValue() != 0 >max:"${item.getMaxSize()}",</#if>
+    <#if item.getMinSize()?? && item.getMinSize() != "">minSize:"${item.getMinSize()}",</#if>
+    <#if item.getMaxSize()?? && item.getMaxSize() != "">maxSize: "${item.getMaxSize()}",</#if>
+    <#if item.getFunnelAlign()?? && item.getFunnelAlign() != "">funnelAlign:"${item.getFunnelAlign()}",</#if></#compress>
+    seriesLayoutBy:"${item.getSeriesLayoutBy()}",
+    encode:{
+        <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
+        itemName:"<#if chartSeriesEncode.getCategory()??>${chartSeriesEncode.getCategory()?lower_case}<#else>${item.getCatalogField()?lower_case}</#if>",
+        value:"<#if chartSeriesEncode.getValue()??>${chartSeriesEncode.getValue()?lower_case}<#else>${item.getValueField()?lower_case}</#if>"
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 折线图序列end -->
\ No newline at end of file

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

+<#-- 折线图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    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()},
+    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>],      
+        y: [<#if chartSeriesEncode.getY()??><#list chartSeriesEncode.getY() as yValue>'${yValue?lower_case}'<#if yValue_has_next>,</#if></#list></#if>]
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 折线图序列end -->
\ No newline at end of file

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

+<#-- 折线图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    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>
+    <#if item.getTop()?? && item.getTop() != 0>top:"${item.getTop()}",</#if>
+    <#if item.getBottom()?? && item.getBottom() != 0>bottom:"${item.getBottom()}",</#if>
+    <#if item.getRight()?? && item.getRight() != "">right:"${item.getRight()}",</#if>
+    <#if item.getWidth()?? && item.getWidth() != "">width:"${item.getWidth()}",</#if>
+    <#if item.getHeight()?? && item.getHeight() != "">height:"${item.getHeight()}",</#if></#compress>
+    seriesLayoutBy:"${item.getSeriesLayoutBy()}",
+    encode:{
+        <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
+        itemName:"<#if chartSeriesEncode.getCategory()??>${chartSeriesEncode.getCategory()?lower_case}<#else>${item.getCatalogField()?lower_case}</#if>",
+        value:"<#if chartSeriesEncode.getValue()??>${chartSeriesEncode.getValue()?lower_case}<#else>${item.getValueField()?lower_case}</#if>"
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 折线图序列end -->
\ No newline at end of file

@CONTROL/数据图表 (新)/CONTROL.html.ftl

+<#assign content>
+    fetchAction="<#if ctrl.getFetchPSControlAction()?? && ctrl.getFetchPSControlAction().getPSAppDEMethod()??>${ctrl.getFetchPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}" 
+</#assign>
+<#ibizinclude>
+../@MACRO/HTML/DEFAULT.html.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/数据图表 (新)/CONTROL.less.ftl

+<#ibizinclude>
+../@MACRO/CSS/DEFAULT.less.ftl
+</#ibizinclude>
+.app-data-chart {
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file

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

+<#ibizinclude>
+../@MACRO/CONTROL/CONTROL.vue.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/数据图表 (新)/MODEL.ts.ftl

+<#ibizinclude>
+../@MACRO/MODEL/MODEL_HEADER.ts.ftl
+</#ibizinclude>
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof ${srfclassname('${ctrl.getCodeName()}')}${srfclassname('${ctrl.name}')}Mode
+	 */
+	public getDataItems(): any[] {
+		return [
+      {
+        name:'query',
+        prop:'query'
+      },
+		]
+	}
+
+<#ibizinclude>
+../@MACRO/MODEL/MODEL_BOTTOM.ts.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/数据图表 (新)/SERVICE.ts.ftl

+<#ibizinclude>
+../@MACRO/SERVICE/SERVICE_HEADER.ts.ftl
+</#ibizinclude>
+
+    /**
+     * 查询数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    @Errorlog
+    public search(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
+        return new Promise((resolve: any, reject: any) => {
+            const _appEntityService: any = this.appEntityService;
+            let result: Promise<any>;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            }else{
+                result =_appEntityService.FetchDefault(Context,Data, isloading);
+            }
+            result.then((response) => {
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });      
+        });
+    }
+<#ibizinclude>
+../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/数据图表 (新)/template.properties

+CTRLTYPE=CHART#NEW
\ No newline at end of file