diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d91e065 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.iml +.idea/ +lib/report/*.jar +.DS_Store +.classpath \ No newline at end of file diff --git a/.idea/libraries/report.xml b/.idea/libraries/report.xml deleted file mode 100644 index 94da0bc..0000000 --- a/.idea/libraries/report.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 4ad0369..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build.xml b/build.xml index 133b054..a04aef3 100644 --- a/build.xml +++ b/build.xml @@ -1,10 +1,11 @@ - + + @@ -29,6 +30,9 @@ + + + @@ -44,7 +48,7 @@ - + @@ -59,11 +63,15 @@ target="${target_jdk_version}" fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}" executable="${compile_jdk_version}/bin/javac"> - + + + + + @@ -93,6 +101,7 @@ + @@ -106,12 +115,16 @@ + + + + + - - + - + \ No newline at end of file diff --git a/plugin-echarts.iml b/plugin-echarts.iml deleted file mode 100644 index 08dd91b..0000000 --- a/plugin-echarts.iml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugin.xml b/plugin.xml index 00ad64b..dc2fa69 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,13 +1,14 @@ com.fr.solution.plugin.chart.echarts + com.fr.solution.plugin yes 3.1 - 8.0 - 2016-05-28 - solution - 这里。如果有其他类型的图表开发需求，可以联系solution@finereport.com。]]> + 10.0 + 2018-10-01 + author + [2016-02-18]饼图(支持多分类饼图)

[2016-03-03]增加国际化支持(美国英语)

@@ -18,20 +19,14 @@ - - - - - +​ - - \ No newline at end of file + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1712de0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + com.fr.plugin + starter + 10.0 + + + jar + demo-show-echarts + + + ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.solution.plugin.chart.echarts-1.0/classes + + + org.apache.maven.plugins + maven-compiler-plugin + + 6 + 6 + + + + + \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMap.java b/src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMap.java deleted file mode 100644 index 90a1874..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMap.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map; - -import com.fr.chart.chartattr.Chart; -import com.fr.general.Inter; -import com.fr.solution.plugin.chart.echarts.common.base.AbstractIndependentEChartsProvider; -import com.fr.solution.plugin.chart.echarts.common.base.ECharts; -import com.fr.solution.plugin.chart.echarts.map.plot.ChineseMapPlot; - -/** - * Created by richie on 16/1/29. - */ -public class EChartsChineseMap extends AbstractIndependentEChartsProvider { - - private static ECharts createChineseMap() { - ChineseMapPlot plot = new ChineseMapPlot(); - return new ECharts(plot); - } - - public static ECharts[] charts = new ECharts[] { - createChineseMap() - }; - - - @Override - public String getChartName() { - return "Plugin-ECharts_Chinese_Map"; - } - - @Override - public Chart[] getChartTypes() { - return charts; - } - - @Override - public String getChartImagePath() { - return "com/fr/solution/plugin/chart/echarts/map/images/map256.png"; - } - -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMapUI.java b/src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMapUI.java deleted file mode 100644 index bc44f41..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMapUI.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map; - -import com.fr.chart.chartattr.Plot; -import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; -import com.fr.solution.plugin.chart.echarts.common.ui.AbstractIndependentEChartsUI; -import com.fr.solution.plugin.chart.echarts.map.ui.ChineseMapReportDataContentPane; -import com.fr.solution.plugin.chart.echarts.map.ui.ChineseMapTableDataContentPane; -import com.fr.solution.plugin.chart.echarts.map.ui.ChineseChartTypePane; - -/** - * Created by richie on 16/1/29. - */ -public class EChartsChineseMapUI extends AbstractIndependentEChartsUI { - @Override - public AbstractChartTypePane getPlotTypePane() { - return new ChineseChartTypePane(); - } - - @Override - public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { - return new ChineseMapTableDataContentPane(parent); - } - - @Override - public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { - return new ChineseMapReportDataContentPane(parent); - } - - @Override - public String getIconPath() { - return "com/fr/solution/plugin/chart/echarts/map/images/chinese.png"; - } -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/glyph/ChineseMapPlotGlyph.java b/src/com/fr/solution/plugin/chart/echarts/map/glyph/ChineseMapPlotGlyph.java deleted file mode 100644 index 209d327..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/glyph/ChineseMapPlotGlyph.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map.glyph; - -import com.fr.json.JSONArray; -import com.fr.json.JSONException; -import com.fr.json.JSONObject; -import com.fr.solution.plugin.chart.echarts.common.glyph.EChartsPlotGlyph; -import com.fr.stable.web.Repository; - -/** - * Created by richie on 16/1/29. - */ -public class ChineseMapPlotGlyph extends EChartsPlotGlyph { - @Override - public void layoutAxisGlyph(int resolution) { - - } - - @Override - public void layoutDataSeriesGlyph(int resolution) { - - } - - @Override - public String getPlotGlyphType() { - return "ChineseMapPlotGlyph"; - } - - @Override - public String getChartType() { - return "ChineseMap"; - } - - public JSONArray toSeriesData(Repository repo) throws JSONException { - JSONArray series = JSONArray.create(); - - series.put(JSONObject.create() - .put("name", "iPhone3") - .put("type", "map") - .put("mapType", "china") - .put("itemStyle", createItemStyle(repo)) - .put("data", JSONArray.create().put(JSONObject.create().put("name", "北京").put("value", 20))) - ); - - series.put(JSONObject.create() - .put("name", "iPhone4") - .put("type", "map") - .put("mapType", "china") - .put("itemStyle", createItemStyle(repo)) - .put("data", JSONArray.create() - .put(JSONObject.create().put("name", "江苏").put("value", 20)) - .put(JSONObject.create().put("name", "四川").put("value", 300)) - ) - ); - - series.put(JSONObject.create() - .put("name", "iPhone5") - .put("type", "map") - .put("mapType", "china") - .put("itemStyle", createItemStyle(repo)) - .put("data", JSONArray.create().put(JSONObject.create().put("name", "四川").put("value", 20))) - ); - - return series; - } - - private JSONObject createItemStyle(Repository repo) throws JSONException { - JSONObject itemStyle = JSONObject.create(); - itemStyle.put("normal", JSONObject.create().put("label", JSONObject.create().put("show", true))); - itemStyle.put("emphasis", JSONObject.create().put("label", JSONObject.create().put("show", true))); - return itemStyle; - } -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/images/chinese.png b/src/com/fr/solution/plugin/chart/echarts/map/images/chinese.png deleted file mode 100644 index e60e12e..0000000 Binary files a/src/com/fr/solution/plugin/chart/echarts/map/images/chinese.png and /dev/null differ diff --git a/src/com/fr/solution/plugin/chart/echarts/map/images/map256.png b/src/com/fr/solution/plugin/chart/echarts/map/images/map256.png deleted file mode 100644 index fab2ba8..0000000 Binary files a/src/com/fr/solution/plugin/chart/echarts/map/images/map256.png and /dev/null differ diff --git a/src/com/fr/solution/plugin/chart/echarts/map/images/map_type1.png b/src/com/fr/solution/plugin/chart/echarts/map/images/map_type1.png deleted file mode 100644 index 62d07e4..0000000 Binary files a/src/com/fr/solution/plugin/chart/echarts/map/images/map_type1.png and /dev/null differ diff --git a/src/com/fr/solution/plugin/chart/echarts/map/monitor/MonitorMap.java b/src/com/fr/solution/plugin/chart/echarts/map/monitor/MonitorMap.java deleted file mode 100644 index e9f6877..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/monitor/MonitorMap.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map.monitor; - -import com.fr.general.Inter; -import com.fr.stable.fun.FunctionHelper; -import com.fr.stable.fun.impl.AbstractFunctionProcessor; - -/** - * Created by richie on 16/2/18. - */ -public class MonitorMap extends AbstractFunctionProcessor { - - private static MonitorMap instance = new MonitorMap(); - - public static MonitorMap getInstance() { - return instance; - } - - private MonitorMap() { - super(); - } - - - @Override - public int getId() { - return FunctionHelper.generateFunctionID("com.fr.solution.plugin.chart.echarts.map"); - } - - @Override - public String getLocaleKey() { - return "Plugin-ECharts_Chinese_Map"; - } - - @Override - public String toString() { - return Inter.getLocText("Plugin-ECharts_Chinese_Map"); - } -} diff --git a/src/com/fr/solution/plugin/chart/echarts/map/plot/ChineseMapPlot.java b/src/com/fr/solution/plugin/chart/echarts/map/plot/ChineseMapPlot.java deleted file mode 100644 index 51ad9a2..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/plot/ChineseMapPlot.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map.plot; - -import com.fr.base.chart.chartdata.ChartData; -import com.fr.chart.chartattr.Plot; -import com.fr.chart.chartdata.NormalChartData; -import com.fr.chart.chartglyph.PlotGlyph; -import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; -import com.fr.solution.plugin.chart.echarts.map.glyph.ChineseMapPlotGlyph; -import com.fr.solution.plugin.chart.echarts.map.monitor.MonitorMap; -import com.fr.solution.plugin.chart.echarts.common.plot.EChartsPlot; -import com.fr.stable.fun.FunctionProcessor; - -/** - * Created by richie on 16/1/29. - */ -public class ChineseMapPlot extends EChartsPlot { - - @Override - public PlotGlyph createPlotGlyph(ChartData chartData) { - PlotGlyph glyph = new ChineseMapPlotGlyph(); - install4PlotGlyph(glyph, chartData); - return glyph; - } - - @Override - public String getPlotID() { - return "EChartsChinaMapPlot"; - } - - @Override - public boolean matchPlotType(Plot newPlot) { - return newPlot instanceof ChineseMapPlot; - } - - @Override - public ChartData defaultChartData() { - return new NormalChartData(); - } - - @Override - public FunctionProcessor getFunctionToRecord() { - return MonitorMap.getInstance(); - } - - public boolean accept(Class obClass) { - return ComparatorUtils.equals(ChineseMapPlot.class, obClass); - } - - @Override - public String getPlotName() { - return Inter.getLocText("Plugin-ECharts_Chinese_Map"); - } - -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseChartTypePane.java b/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseChartTypePane.java deleted file mode 100644 index c9cbd31..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseChartTypePane.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map.ui; - -import com.fr.chart.chartattr.Chart; -import com.fr.design.mainframe.chart.gui.type.UserDefinedChartTypePane; -import com.fr.general.Inter; -import com.fr.solution.plugin.chart.echarts.map.EChartsChineseMap; -import com.fr.solution.plugin.chart.echarts.map.plot.ChineseMapPlot; - -/** - * Created by richie on 16/1/29. - */ -public class ChineseChartTypePane extends UserDefinedChartTypePane { - /** - * 弹出框的标题 - * - * @return 弹出框的标题 - */ - public String title4PopupWindow() { - return Inter.getLocText("Plugin-ECharts_Chinese_Map"); - } - - public void updateBean(Chart chart) { - if (chart != null) { - chart.setPlot(new ChineseMapPlot()); - } - } - - @Override - protected String getPlotTypeID() { - return null; - } - - /** - * 界面是否接受 - * @param ob 对象是否为chart - * @return 界面是否接受对象 - */ - public boolean accept(Object ob) { - return (ob instanceof Chart)&&((Chart) ob).getPlot().accept(ChineseMapPlot.class); - } - - @Override - public Chart getDefaultChart() { - return EChartsChineseMap.charts[0]; - } - - @Override - protected String[] getTypeIconPath() { - return new String[]{ - "/com/fr/solution/plugin/chart/echarts/map/images/map_type1.png" - }; - } -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapReportDataContentPane.java b/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapReportDataContentPane.java deleted file mode 100644 index 811c039..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapReportDataContentPane.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map.ui; - -import com.fr.chart.chartattr.ChartCollection; -import com.fr.design.event.UIObserver; -import com.fr.design.event.UIObserverListener; -import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; - -import java.util.List; - -/** - * Created by richie on 16/1/29. - */ -public class ChineseMapReportDataContentPane extends AbstractReportDataContentPane implements UIObserver { - - public ChineseMapReportDataContentPane(ChartDataPane parent) { - - } - - @Override - protected String[] columnNames() { - return new String[0]; - } - - @Override - public void populateBean(ChartCollection ob) { - - } - - @Override - public void registerChangeListener(UIObserverListener listener) { - - } - - @Override - public boolean shouldResponseChangeListener() { - return true; - } -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapTableDataContentPane.java b/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapTableDataContentPane.java deleted file mode 100644 index b2bc689..0000000 --- a/src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapTableDataContentPane.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fr.solution.plugin.chart.echarts.map.ui; - -import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.solution.plugin.chart.echarts.common.ui.data.AbstractEChartsTableDataContentPane; - -/** - * Created by richie on 16/1/29. - */ -public class ChineseMapTableDataContentPane extends AbstractEChartsTableDataContentPane { - - public ChineseMapTableDataContentPane(ChartDataPane parent) { - super(parent); - } -} \ No newline at end of file diff --git a/src/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java similarity index 88% rename from src/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java index fdae89f..8a87c25 100644 --- a/src/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java @@ -19,9 +19,6 @@ import com.fr.solution.plugin.chart.echarts.common.plot.EChartsPlot; import com.fr.solution.plugin.chart.echarts.common.theme.EChartsTheme; import com.fr.solution.plugin.chart.echarts.common.title.EChartsTitle; import com.fr.solution.plugin.chart.echarts.common.tooltip.EChartsTooltip; -import com.fr.stable.fun.FunctionHelper; -import com.fr.stable.fun.FunctionProcessor; -import com.fr.stable.fun.impl.AbstractFunctionProcessor; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLableReader; @@ -31,18 +28,6 @@ import com.fr.stable.xml.XMLableReader; */ public class ECharts extends Chart { - private static final FunctionProcessor P = new AbstractFunctionProcessor() { - @Override - public int getId() { - return FunctionHelper.generateFunctionID("com.fr.solution.plugin.chart.echarts"); - } - - @Override - public String getLocaleKey() { - return "ECharts"; - } - }; - private EChartsTheme theme; private EChartsTooltip tooltip; @@ -78,14 +63,14 @@ public class ECharts extends Chart { public BaseChartGlyph createGlyph(ChartData chartData) { EChartsGlyph glyph = new EChartsGlyph(); glyph.setGeneralInfo(this); - EChartsPlot EChartsPlot = (EChartsPlot) getPlot(); + EChartsPlot EChartsPlot = getPlot(); if (EChartsPlot != null) { PlotGlyph plotGlyph = EChartsPlot.createPlotGlyph(chartData); glyph.setPlotGlyph(plotGlyph); EChartsLegendGlyph legendGlyph = EChartsPlot.createLegendGlyph(plotGlyph); glyph.setLegendGlyph(legendGlyph); } - EChartsTitle title = (EChartsTitle)getTitle(); + EChartsTitle title = (EChartsTitle) getTitle(); if (title != null) { EChartsTitleGlyph titleGlyph = title.createGlyph(); glyph.setTitleGlyph(titleGlyph); @@ -108,10 +93,11 @@ public class ECharts extends Chart { /** * 判断图表类型是否是obClass + * * @param obClass 传入对象 * @return 是否是obClass对象 */ - public boolean accept(Class obClass){ + public boolean accept(Class obClass) { return ComparatorUtils.equals(ECharts.class, obClass); } @@ -128,8 +114,8 @@ public class ECharts extends Chart { setPlot((Plot) GeneralXMLTools.readXMLable(reader)); } else if (tmpNodeName.equals("ChartAttr")) { this.setJSDraw(reader.getAttrAsBoolean("isJSDraw", true)); - this.setStyleGlobal(reader.getAttrAsBoolean("isStyleGlobal",false)); - } else if(ComparatorUtils.equals(tmpNodeName, "ChartDefinition")) { + this.setStyleGlobal(reader.getAttrAsBoolean("isStyleGlobal", false)); + } else if (ComparatorUtils.equals(tmpNodeName, "ChartDefinition")) { reader.readXMLObject(new XMLReadable() { public void readXML(XMLableReader reader) { setFilterDefinition(readDefinition(reader)); @@ -152,7 +138,7 @@ public class ECharts extends Chart { filterDefinition = new EChartsMoreNameCDDefinition(); } else if (EChartsNormalReportDataDefinition.XML_TAG.equals(tmpNodeName)) { filterDefinition = new EChartsNormalReportDataDefinition(); - }else { + } else { return ChartXMLCompatibleUtils.readDefinition(reader); } @@ -161,7 +147,6 @@ public class ECharts extends Chart { } - @Override public void writeXML(XMLPrintWriter writer) { super.writeXML(writer); diff --git a/src/main/java/com/fr/solution/plugin/chart/echarts/common/base/EChartsConstants.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/base/EChartsConstants.java new file mode 100644 index 0000000..c10add8 --- /dev/null +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/common/base/EChartsConstants.java @@ -0,0 +1,6 @@ +package com.fr.solution.plugin.chart.echarts.common.base; + +public class EChartsConstants { + + public static final String PLUGIN_ID = "com.fr.solution.plugin.chart.echarts"; +} diff --git a/src/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java similarity index 97% rename from src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java index e8773c9..122f7bf 100644 --- a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java @@ -27,7 +27,7 @@ public class EChartsGlyph extends ChartGlyph { @Override public JSONObject toJSONObject(Repository repo) throws JSONException { - JSONObject jo = new JSONObject(); + JSONObject jo = JSONObject.create(); EChartsTitleGlyph titleGlyph = (EChartsTitleGlyph) getTitleGlyph(); if (titleGlyph != null) { jo.put("title", titleGlyph.toJSONObject(repo)); diff --git a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java similarity index 94% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java index b7f474d..5e7e8e5 100644 --- a/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java @@ -56,9 +56,9 @@ public abstract class AbstractEChartsTypePane extends AbstractChartTypePane{ * 保存界面属性 */ public void updateBean(Chart chart) { - checkTypeChange(); Plot oldPlot = chart.getPlot(); Plot newPlot = getSelectedClonedPlot(); + checkTypeChange(oldPlot); boolean samePlot = accept(chart); if(typeChanged && samePlot){ //同一中图表切换不同类型 @@ -70,11 +70,10 @@ public abstract class AbstractEChartsTypePane extends AbstractChartTypePane{ } } - protected void checkTypeChange(){ + protected void checkTypeChange(Plot oldPlot){ for(int i = 0; i < typeDemo.size(); i++){ - if(typeDemo.get(i).isPressing && i != lastTypeIndex){ + if(typeDemo.get(i).isPressing && i != oldPlot.getDetailType()){ typeChanged = true; - lastTypeIndex = i; break; } typeChanged = false; diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java similarity index 97% rename from src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java index 67998bb..a3a14ac 100644 --- a/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java @@ -1,7 +1,6 @@ package com.fr.solution.plugin.chart.echarts.pie; import com.fr.chart.chartattr.Chart; -import com.fr.general.Inter; import com.fr.solution.plugin.chart.echarts.common.base.AbstractIndependentEChartsProvider; import com.fr.solution.plugin.chart.echarts.common.base.ECharts; import com.fr.solution.plugin.chart.echarts.pie.plot.EChartsPiePlot; diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java similarity index 90% rename from src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java index f7b3530..9428d5b 100644 --- a/src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java @@ -2,10 +2,14 @@ package com.fr.solution.plugin.chart.echarts.pie.glyph; import com.fr.chart.chartglyph.DataPoint; import com.fr.chart.chartglyph.DataSeries; +import com.fr.intelli.record.Focus; +import com.fr.intelli.record.Original; import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONFunction; import com.fr.json.JSONObject; +import com.fr.record.analyzer.EnableMetrics; +import com.fr.solution.plugin.chart.echarts.common.base.EChartsConstants; import com.fr.solution.plugin.chart.echarts.common.glyph.EChartsPlotGlyph; import com.fr.solution.plugin.chart.echarts.pie.plot.RoseType; import com.fr.stable.web.Repository; @@ -16,6 +20,7 @@ import java.text.NumberFormat; /** * Created by richie on 16/2/18. */ +@EnableMetrics public class EChartsPiePlotGlyph extends EChartsPlotGlyph { private static final NumberFormat format = new DecimalFormat("##%"); @@ -40,6 +45,7 @@ public class EChartsPiePlotGlyph extends EChartsPlotGlyph { return "EChartsPie"; } + @Focus(id=EChartsConstants.PLUGIN_ID, text = "", source = Original.PLUGIN) public JSONArray toSeriesData(Repository repo) throws JSONException { JSONArray result = JSONArray.create(); int cn = getCategoryCount(); diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java similarity index 92% rename from src/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java index 3d78c6f..1d3cac8 100644 --- a/src/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java @@ -6,11 +6,9 @@ import com.fr.chart.chartdata.NormalChartData; import com.fr.chart.chartglyph.PlotGlyph; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; -import com.fr.solution.plugin.chart.echarts.pie.glyph.EChartsPiePlotGlyph; -import com.fr.solution.plugin.chart.echarts.pie.monitor.MonitorPie; import com.fr.solution.plugin.chart.echarts.common.plot.EChartsPlot; +import com.fr.solution.plugin.chart.echarts.pie.glyph.EChartsPiePlotGlyph; import com.fr.stable.StringUtils; -import com.fr.stable.fun.FunctionProcessor; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; @@ -58,10 +56,6 @@ public class EChartsPiePlot extends EChartsPlot { return new NormalChartData(); } - @Override - public FunctionProcessor getFunctionToRecord() { - return MonitorPie.getInstance(); - } public boolean accept(Class obClass) { return ComparatorUtils.equals(EChartsPiePlot.class, obClass); diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java similarity index 90% rename from src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java index 1167503..fe7edd4 100644 --- a/src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java +++ b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java @@ -6,12 +6,9 @@ import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.solution.plugin.chart.echarts.common.base.ECharts; +import com.fr.solution.plugin.chart.echarts.common.ui.AbstractEChartsTypePane; import com.fr.solution.plugin.chart.echarts.pie.EChartsPie; import com.fr.solution.plugin.chart.echarts.pie.plot.EChartsPiePlot; -import com.fr.solution.plugin.chart.echarts.common.ui.AbstractEChartsTypePane; - -import java.util.ArrayList; -import java.util.List; /** * Created by richie on 16/1/29. @@ -47,10 +44,7 @@ public class EChartsPieChartTypePane extends AbstractEChartsTypePane { imagePane.isPressing = false; } Plot plot = chart.getPlot(); - if(plot instanceof EChartsPiePlot) { - lastTypeIndex = ((EChartsPiePlot)plot).getPieType().ordinal(); - typeDemo.get(lastTypeIndex).isPressing = true; - } + typeDemo.get(plot.getDetailType()).isPressing = true; checkDemosBackground(); } @@ -75,7 +69,7 @@ public class EChartsPieChartTypePane extends AbstractEChartsTypePane { Chart[] pieChart = EChartsPie.charts; for(int i = 0, len = pieChart.length; i < len; i++){ if(typeDemo.get(i).isPressing){ - newPlot = (EChartsPiePlot)pieChart[i].getPlot(); + newPlot = pieChart[i].getPlot(); } } diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java b/src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java rename to src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java diff --git a/src/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js b/src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js rename to src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js diff --git a/src/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js b/src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js rename to src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js diff --git a/src/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js b/src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js rename to src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js diff --git a/src/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js b/src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js rename to src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js diff --git a/src/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png b/src/main/resources/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png rename to src/main/resources/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png diff --git a/src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties b/src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts.properties similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties rename to src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts.properties diff --git a/src/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties b/src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties rename to src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties diff --git a/src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties b/src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties rename to src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie.png b/src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/images/pie.png rename to src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie.png diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png b/src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png rename to src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png b/src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png rename to src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png b/src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png rename to src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png diff --git a/src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png b/src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png similarity index 100% rename from src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png rename to src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png diff --git a/tpl/echarts.frm b/tpl/echarts.frm index b9a7949..3edd83c 100644 --- a/tpl/echarts.frm +++ b/tpl/echarts.frm @@ -1,5 +1,5 @@ -
+ @@ -9,20 +9,24 @@ - + b^bZM]AMqg),@_CiB.-*cS0k+FW+'A/`l?"h69pZB:/`r)Y,=G3TBoa60[.nb(f _!Cc3.guP9!rT[VgkiAnZi@ + + + + - + - + @@ -34,12 +38,12 @@ _!Cc3.guP9!rT[VgkiAnZi@
- + - + @@ -51,13 +55,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + - + @@ -69,13 +73,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + - + @@ -85,8 +89,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + + + + + + @@ -94,14 +103,14 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + <GI> <AttrBackground> @@ -117,31 +126,32 @@ _!Cc3.guP9!rT[VgkiAnZi@<m57de;GLTFG[9-&HD~ </AttrAlpha> </GI> <O> -<![CDATA[ECharts饼图]]></O> +<![CDATA[新建图表标题]]></O> <TextAttr> <Attr alignText="0"> -<FRFont name="Microsoft YaHei" style="0" size="88"/> +<FRFont name="Microsoft YaHei" style="0" size="128" foreground="-13421773"/> </Attr> </TextAttr> <TitleVisible value="true" position="0"/> - - - + + + + - - + + - + @@ -155,331 +165,78 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<GI> -<AttrBackground> -<Background name="NullBackground"/> -<Attr shadow="false"/> -</AttrBackground> -<AttrBorder> -<Attr lineStyle="0" isRoundBorder="false" roundRadius="0"/> -<newColor borderColor="-6908266"/> -</AttrBorder> -<AttrAlpha> -<Attr alpha="1.0"/> -</AttrAlpha> -</GI> -<O> -<![CDATA[ECharts饼图]]></O> +<ConditionAttr name=""> +<AttrList> +<Attr class="com.fr.plugin.chart.base.AttrTooltip"> +<AttrTooltip> +<Attr enable="true" duration="4" followMouse="false" showMutiSeries="false" isCustom="false"/> <TextAttr> -<Attr alignText="0"> -<FRFont name="Microsoft YaHei" style="0" size="88"/> -</Attr> +<Attr alignText="0"/> </TextAttr> -<TitleVisible value="true" position="0"/> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<GI> -<AttrBackground> -<Background name="NullBackground"/> -<Attr shadow="false"/> -</AttrBackground> -<AttrBorder> -<Attr lineStyle="0" isRoundBorder="false" roundRadius="0"/> -<newColor borderColor="-6908266"/> -</AttrBorder> -<AttrAlpha> -<Attr alpha="1.0"/> +<Attr alpha="0.5"/> </AttrAlpha> </GI> -<O> -<![CDATA[FineCharts饼图]]></O> -<TextAttr> -<Attr alignText="0"> -<FRFont name="Microsoft YaHei" style="0" size="88"/> +</AttrTooltip> </Attr> -</TextAttr> -<TitleVisible value="true" position="0"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -488,15 +245,17 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + + + @@ -513,38 +272,110 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + - - + + + - + - + + + - + - + @@ -554,8 +385,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + + + + + + @@ -563,13 +399,14 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + + <GI> <AttrBackground> @@ -585,16 +422,18 @@ _!Cc3.guP9!rT[VgkiAnZi@<m57de;GLTFG[9-&HD~ </AttrAlpha> </GI> <O> -<![CDATA[FineCharts饼图]]></O> +<![CDATA[新建图表标题]]></O> <TextAttr> <Attr alignText="0"> -<FRFont name="Microsoft YaHei" style="0" size="88"/> +<FRFont name="Microsoft YaHei" style="0" size="128" foreground="-13421773"/> </Attr> </TextAttr> <TitleVisible value="true" position="0"/> - - + + + + @@ -602,21 +441,21 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + - + - + @@ -624,6 +463,65 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -634,6 +532,7 @@ _!Cc3.guP9!rT[VgkiAnZi@ + @@ -642,15 +541,17 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + + + @@ -667,30 +568,112 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + - - + + + + + + + + + + + + + + + - - + + - + @@ -702,13 +685,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + - + @@ -718,8 +701,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + + + + + + @@ -727,14 +715,14 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + <GI> <AttrBackground> @@ -750,31 +738,31 @@ _!Cc3.guP9!rT[VgkiAnZi@<m57de;GLTFG[9-&HD~ </AttrAlpha> </GI> <O> -<![CDATA[新特性饼图]]></O> +<![CDATA[ECharts饼图]]></O> <TextAttr> <Attr alignText="0"> -<FRFont name="Microsoft YaHei" style="0" size="128" foreground="-13421773"/> +<FRFont name="Microsoft YaHei" style="0" size="88"/> </Attr> </TextAttr> <TitleVisible value="true" position="0"/> - - - + + + - - + + - + @@ -788,71 +776,9 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -861,17 +787,15 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + - - @@ -888,13 +812,15 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + - + @@ -903,30 +829,25 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + - + - - + + - + @@ -936,8 +857,13 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - + + + + + + + @@ -945,14 +871,14 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + <GI> <AttrBackground> @@ -968,31 +894,31 @@ _!Cc3.guP9!rT[VgkiAnZi@<m57de;GLTFG[9-&HD~ </AttrAlpha> </GI> <O> -<![CDATA[新特性饼图]]></O> +<![CDATA[ECharts饼图]]></O> <TextAttr> <Attr alignText="0"> -<FRFont name="Microsoft YaHei" style="0" size="128" foreground="-13421773"/> +<FRFont name="Microsoft YaHei" style="0" size="88"/> </Attr> </TextAttr> <TitleVisible value="true" position="0"/> - - - + + + - - + + - + @@ -1006,71 +932,9 @@ _!Cc3.guP9!rT[VgkiAnZi@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -1079,17 +943,15 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + - - @@ -1106,47 +968,35 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + - + - - - - - - - - - - - + - + - + - + @@ -1159,12 +1009,12 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - + @@ -1174,6 +1024,11 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + + + + @@ -1216,15 +1071,15 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + - - + + @@ -1280,10 +1135,12 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + @@ -1298,18 +1155,22 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + + + - + - + - + @@ -1319,6 +1180,11 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + + + + @@ -1361,7 +1227,7 @@ _!Cc3.guP9!rT[VgkiAnZi@ - + @@ -1425,10 +1291,12 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + @@ -1443,17 +1311,31 @@ _!Cc3.guP9!rT[VgkiAnZi@ + + + + - + + + + + + + - + +
- + + + +