Browse Source

echarts插件示例适配10.0

pull/1/head
richie 6 years ago
parent
commit
7eafd9a4af
  1. 5
      .gitignore
  2. 19
      .idea/libraries/report.xml
  3. 8
      .idea/modules.xml
  4. 6
      .idea/vcs.xml
  5. 25
      build.xml
  6. 35
      plugin-echarts.iml
  7. 21
      plugin.xml
  8. 29
      pom.xml
  9. 39
      src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMap.java
  10. 36
      src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMapUI.java
  11. 72
      src/com/fr/solution/plugin/chart/echarts/map/glyph/ChineseMapPlotGlyph.java
  12. BIN
      src/com/fr/solution/plugin/chart/echarts/map/images/chinese.png
  13. BIN
      src/com/fr/solution/plugin/chart/echarts/map/images/map256.png
  14. BIN
      src/com/fr/solution/plugin/chart/echarts/map/images/map_type1.png
  15. 37
      src/com/fr/solution/plugin/chart/echarts/map/monitor/MonitorMap.java
  16. 55
      src/com/fr/solution/plugin/chart/echarts/map/plot/ChineseMapPlot.java
  17. 53
      src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseChartTypePane.java
  18. 40
      src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapReportDataContentPane.java
  19. 14
      src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapTableDataContentPane.java
  20. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java
  21. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java
  22. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java
  23. 29
      src/main/java/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java
  24. 6
      src/main/java/com/fr/solution/plugin/chart/echarts/common/base/EChartsConstants.java
  25. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java
  26. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java
  27. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java
  28. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java
  29. 2
      src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java
  30. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java
  31. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java
  32. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java
  33. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java
  34. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java
  35. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java
  36. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java
  37. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java
  38. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java
  39. 7
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java
  40. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java
  41. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java
  42. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java
  43. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java
  44. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java
  45. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java
  46. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java
  47. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java
  48. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java
  49. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java
  50. 1
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java
  51. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java
  52. 6
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java
  53. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java
  54. 8
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java
  55. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java
  56. 12
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java
  57. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java
  58. 0
      src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java
  59. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js
  60. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js
  61. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js
  62. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js
  63. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png
  64. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts.properties
  65. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties
  66. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties
  67. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie.png
  68. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png
  69. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png
  70. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png
  71. 0
      src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png
  72. 1002
      tpl/echarts.frm

5
.gitignore vendored

@ -0,0 +1,5 @@
*.iml
.idea/
lib/report/*.jar
.DS_Store
.classpath

19
.idea/libraries/report.xml

@ -1,19 +0,0 @@
<component name="libraryTable">
<library name="report">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/report/fr-platform-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-chart-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-core-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/servlet-api.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-performance-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-designer-core-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-third-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-designer-report-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-report-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-designer-feedback-8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/report/fr-designer-chart-8.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

8
.idea/modules.xml

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/plugin-echarts.iml" filepath="$PROJECT_DIR$/plugin-echarts.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

25
build.xml

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project basedir="." default="jar" name="plugin">
<!-- JDK路径,根据自己机器上实际位置修改-->
<property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_40.jdk/Contents/Home"/>
<property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_172.jdk/Contents/Home"/>
<property name="libs" value="${basedir}/lib"/>
<property name="publicLibs" value=""/>
<property name="reportLibs" value="${basedir}/../webroot/WEB-INF/lib"/>
<property name="destLoc" value="."/>
<property name="classes" value="classes"/>
<xmlproperty file="${basedir}/plugin.xml"/>
@ -29,6 +30,9 @@
<fileset dir="${publicLibs}">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${reportLibs}">
<include name="**/*.jar"/>
</fileset>
</path>
<patternset id="resources4Jar">
<exclude name="**/.settings/**"/>
@ -44,7 +48,7 @@
<echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
<delete dir="tmp"/>
<copy todir="tmp">
<fileset dir="${resources_from}\src">
<fileset dir="${resources_from}/src/main/resources">
<patternset refid="resources4Jar"/>
</fileset>
</copy>
@ -59,11 +63,15 @@
target="${target_jdk_version}"
fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
executable="${compile_jdk_version}/bin/javac">
<src path="${basedir}/src"/>
<src path="${basedir}/src/main/java"/>
<exclude name="**/.svn/**"/>
<compilerarg line="-encoding UTF8 "/>
<classpath refid="compile.classpath"/>
</javac>
<taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
<classpath refid="compile.classpath"/>
</taskdef>
<pretreatment baseDir="${basedir}"/>
</target>
<target name="jar_classes">
@ -93,6 +101,7 @@
<delete dir="${classes}"/>
</target>
<target name="jar" depends="super_jar">
<antcall target="zip"/>
</target>
@ -106,12 +115,16 @@
<include name="${plugin-jar}"/>
<include name="plugin.xml"/>
</fileset>
<fileset dir="${libs}">
<include name="*.jar"/>
<include name="*.dll"/>
</fileset>
</copy>
<zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
<include name="${plugin-folder}/*.jar"/>
<include name="${plugin-folder}/*.dll"/>
<include name="${plugin-folder}/plugin.xml"/>
</zip>
<xmlproperty file="${basedir}/plugin.xml"/>
<move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
<move file="${plugin-folder}.zip" todir="${destLoc}/install"/>
</target>
</project>
</project>

35
plugin-echarts.iml

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$USER_HOME$/Documents/finereport/env/8.0/WebReport/WEB-INF/classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="module" module-name="base" />
<orderEntry type="module" module-name="base-basic" />
<orderEntry type="module" module-name="base-calculate" />
<orderEntry type="module" module-name="base-data" />
<orderEntry type="module" module-name="base-file" />
<orderEntry type="module" module-name="base-performance" />
<orderEntry type="module" module-name="base-stable" />
<orderEntry type="module" module-name="chart-base" />
<orderEntry type="module" module-name="chart-chartattr" />
<orderEntry type="module" module-name="chart-chartdata" />
<orderEntry type="module" module-name="chart-chartglyph" />
<orderEntry type="module" module-name="chart-web" />
<orderEntry type="module" module-name="designer" />
<orderEntry type="module" module-name="designer_base" />
<orderEntry type="module" module-name="designer_chart" />
<orderEntry type="module" module-name="designer_feedback" />
<orderEntry type="module" module-name="designer_form" />
<orderEntry type="module" module-name="engine" />
<orderEntry type="module" module-name="engine-page" />
<orderEntry type="module" module-name="engine-remote" />
<orderEntry type="module" module-name="engine-view" />
<orderEntry type="module" module-name="engine-write" />
<orderEntry type="module" module-name="form" />
</component>
</module>

21
plugin.xml

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<plugin>
<id>com.fr.solution.plugin.chart.echarts</id>
<main-package>com.fr.solution.plugin</main-package>
<name><![CDATA[ECharts图表]]></name>
<active>yes</active>
<version>3.1</version>
<env-version>8.0</env-version>
<jartime>2016-05-28</jartime>
<vendor email="solution@finereport.com">solution</vendor>
<description><![CDATA[ECharts图表,源码和效果图可查看<a href="http://www.finedevelop.com:2015/projects/FS/repos/plugin-echarts-public">这里</a>。如果有其他类型的图表开发需求,可以联系solution@finereport.com。]]></description>
<env-version>10.0</env-version>
<jartime>2018-10-01</jartime>
<vendor>author</vendor>
<description><![CDATA[ECharts图表。]]></description>
<change-notes><![CDATA[
<p>[2016-02-18]饼图(支持多分类饼图)</p>
<p>[2016-03-03]增加国际化支持(美国英语)</p>
@ -18,20 +19,14 @@
<LocaleFinder class="com.fr.solution.plugin.chart.echarts.common.EChartsLocaleFinder"/>
<JavaScriptFileHandler class="com.fr.solution.plugin.chart.echarts.common.EChartsFileLoader"/>
</extra-core>
<extra-report/>
<extra-designer/>
<extra-platform/>
<extra-chart>
<IndependentChartProvider class="com.fr.solution.plugin.chart.echarts.pie.EChartsPie"
plotID="EChartsPiePlot"/>
<IndependentChartProvider class="com.fr.solution.plugin.chart.echarts.map.EChartsChineseMap"
plotID="EChartsChinaMapPlot"/>
</extra-chart>
<extra-chart-designer>
<IndependentChartUIProvider class="com.fr.solution.plugin.chart.echarts.pie.EChartsPieUI"
plotID="EChartsPiePlot"/>
<IndependentChartUIProvider class="com.fr.solution.plugin.chart.echarts.map.EChartsChineseMapUI"
plotID="EChartsChinaMapPlot"/>
</extra-chart-designer>
</plugin>
<function-recorder class="com.fr.solution.plugin.chart.echarts.pie.glyph.EChartsPiePlotGlyph"/>
</plugin>

29
pom.xml

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.plugin</groupId>
<artifactId>starter</artifactId>
<version>10.0</version>
</parent>
<packaging>jar</packaging>
<artifactId>demo-show-echarts</artifactId>
<build>
<!---如果要更改调试插件,改这里的配置就可以了-->
<outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.solution.plugin.chart.echarts-1.0/classes</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>6</source>
<target>6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

39
src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMap.java

@ -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";
}
}

36
src/com/fr/solution/plugin/chart/echarts/map/EChartsChineseMapUI.java

@ -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";
}
}

72
src/com/fr/solution/plugin/chart/echarts/map/glyph/ChineseMapPlotGlyph.java

@ -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;
}
}

BIN
src/com/fr/solution/plugin/chart/echarts/map/images/chinese.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/com/fr/solution/plugin/chart/echarts/map/images/map256.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

BIN
src/com/fr/solution/plugin/chart/echarts/map/images/map_type1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

37
src/com/fr/solution/plugin/chart/echarts/map/monitor/MonitorMap.java

@ -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");
}
}

55
src/com/fr/solution/plugin/chart/echarts/map/plot/ChineseMapPlot.java

@ -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<? extends Plot> obClass) {
return ComparatorUtils.equals(ChineseMapPlot.class, obClass);
}
@Override
public String getPlotName() {
return Inter.getLocText("Plugin-ECharts_Chinese_Map");
}
}

53
src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseChartTypePane.java

@ -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"
};
}
}

40
src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapReportDataContentPane.java

@ -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;
}
}

14
src/com/fr/solution/plugin/chart/echarts/map/ui/ChineseMapTableDataContentPane.java

@ -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);
}
}

0
src/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsFileLoader.java

0
src/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/EChartsLocaleFinder.java

0
src/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/base/AbstractIndependentEChartsProvider.java

29
src/com/fr/solution/plugin/chart/echarts/common/base/ECharts.java → 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<? extends Chart> obClass){
public boolean accept(Class<? extends Chart> 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);

6
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";
}

0
src/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsMoreNameCDDefinition.java

0
src/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalChartData.java

0
src/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsNormalReportDataDefinition.java

0
src/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/data/EChartsOneValueCDDefinition.java

2
src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsGlyph.java → 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));

0
src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsLegendGlyph.java

0
src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsPlotGlyph.java

0
src/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/glyph/EChartsTitleGlyph.java

0
src/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/legend/EChartsLegend.java

0
src/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/plot/EChartsPlot.java

0
src/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/theme/EChartsTheme.java

0
src/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/title/EChartsTitle.java

0
src/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/EChartsTooltip.java

0
src/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/tooltip/TriggerType.java

7
src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractEChartsTypePane.java → 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;

0
src/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/AbstractIndependentEChartsUI.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsLegendPane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsStylePane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsThemePane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTitlePane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/EChartsTooltipPane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsReportDataContentPane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/data/AbstractEChartsTableDataContentPane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/filter/NewDataFilterPane.java

0
src/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java → src/main/java/com/fr/solution/plugin/chart/echarts/common/ui/series/NewSeriesTypeUsePane.java

1
src/com/fr/solution/plugin/chart/echarts/pie/EChartsPie.java → 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;

0
src/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java → src/main/java/com/fr/solution/plugin/chart/echarts/pie/EChartsPieUI.java

6
src/com/fr/solution/plugin/chart/echarts/pie/glyph/EChartsPiePlotGlyph.java → 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();

0
src/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java → src/main/java/com/fr/solution/plugin/chart/echarts/pie/monitor/MonitorPie.java

8
src/com/fr/solution/plugin/chart/echarts/pie/plot/EChartsPiePlot.java → 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<? extends Plot> obClass) {
return ComparatorUtils.equals(EChartsPiePlot.class, obClass);

0
src/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java → src/main/java/com/fr/solution/plugin/chart/echarts/pie/plot/RoseType.java

12
src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieChartTypePane.java → 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();
}
}

0
src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieReportDataContentPane.java

0
src/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java → src/main/java/com/fr/solution/plugin/chart/echarts/pie/ui/EChartsPieTableDataContentPane.java

0
src/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js → src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.bridge.js

0
src/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js → src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/echarts.loader.js

0
src/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js → src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/lib/echarts.min.js vendored

0
src/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js → src/main/resources/com/fr/solution/plugin/chart/echarts/common/web/theme/dark.js

0
src/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png → src/main/resources/com/fr/solution/plugin/chart/echarts/images/toolbar_item.png

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 314 B

0
src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties → src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts.properties

0
src/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties → src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_en_US.properties

0
src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties → src/main/resources/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties

0
src/com/fr/solution/plugin/chart/echarts/pie/images/pie.png → src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
src/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png → src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie256.png

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png → src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_area.png

Before

Width:  |  Height:  |  Size: 1017 B

After

Width:  |  Height:  |  Size: 1017 B

0
src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png → src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_none.png

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
src/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png → src/main/resources/com/fr/solution/plugin/chart/echarts/pie/images/pie_type_radius.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

1002
tpl/echarts.frm

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save