From 301d37bd490f5a4dffb06ae785e2dd2e692fd674 Mon Sep 17 00:00:00 2001
From: richie <richie@finereport.com>
Date: Fri, 29 Jan 2016 14:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                                    | 34 +++++++------
 .../plugin/chart/echarts/core/EChartsBar.java | 50 -------------------
 .../plugin/chart/echarts/plugin-echarts.iml   | 36 -------------
 .../chart/echarts/EChartsFileLoader.java      | 15 ++++++
 .../chart/echarts/EChartsLocaleFinder.java    | 13 +++++
 .../chart/echarts/locale/echarts.properties   |  0
 .../echarts/locale/echarts_zh_CN.properties   |  0
 .../chart/echarts/ui/map/ChinaMapChartUI.java | 33 ++++++++++++
 .../chart/echarts/web/lib/echarts.min.js      |  0
 9 files changed, 80 insertions(+), 101 deletions(-)
 delete mode 100644 src/com/fr/plugin/chart/echarts/core/EChartsBar.java
 delete mode 100644 src/com/fr/plugin/chart/echarts/plugin-echarts.iml
 create mode 100644 src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java
 create mode 100644 src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java
 create mode 100644 src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties
 create mode 100644 src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties
 create mode 100644 src/com/fr/solution/plugin/chart/echarts/ui/map/ChinaMapChartUI.java
 rename src/com/fr/{ => solution}/plugin/chart/echarts/web/lib/echarts.min.js (100%)

diff --git a/plugin.xml b/plugin.xml
index 5f38a26..fec9a56 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<plugin>
-    <id>com.fr.plugin.chart.echarts</id>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><plugin>
+    <id>com.fr.plugin.solution.chart.echarts</id>
     <name><![CDATA[ECharts图表]]></name>
     <active>yes</active>
-    <version>1.2</version>
+    <version>1.1</version>
     <env-version>8.0</env-version>
-	 <jartime>2016-01-21</jartime>
-    <vendor>洪七公</vendor>
-    <description><![CDATA[在FineReport中支持ECharts的图表（仅支持预览）]]></description>
+    <jartime>2016-01-11</jartime>
+    <vendor>solution</vendor>
+    <description><![CDATA[ECharts图表]]></description>
     <change-notes><![CDATA[
-        <p>[2016-01-19]例子</p>
+        <p>[2016-01-01]中国地图</p>
     ]]></change-notes>
     <extra-core>
-        
+        <LocaleFinder class="com.fr.solution.plugin.chart.echarts.EChartsFileLoader"/>
+        <JavaScriptFileHandler class="com.fr.solution.plugin.chart.echarts.EChartsFileLoader"/>
     </extra-core>
-    <extra-report>
-       
-    </extra-report>
-    <extra-designer>
-        
-    </extra-designer>
+    <extra-report/>
+    <extra-designer/>
+    <extra-platform/>
+    <extra-chart>
+        <IndependentChartProvider class="com.fr.solution.plugin.chart.echarts.ui.map.ChinaMapChartUI" plotID="ChineseMapPlot"/>
+    </extra-chart>
+
+    <extra-chart-designer>
+        <IndependentChartUIProvider class="com.fr.solution.plugin.chart.chinesemap.ChineseMapUI" plotID="ChineseMapPlot"/>
+    </extra-chart-designer>
 </plugin>
\ No newline at end of file
diff --git a/src/com/fr/plugin/chart/echarts/core/EChartsBar.java b/src/com/fr/plugin/chart/echarts/core/EChartsBar.java
deleted file mode 100644
index f98577e..0000000
--- a/src/com/fr/plugin/chart/echarts/core/EChartsBar.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.fr.plugin.chart.echarts;
-
-import com.fr.chart.chartattr.Chart;
-import com.fr.chart.fun.impl.AbstractIndependentChartProvider;
-import com.fr.general.Inter;
-import com.fr.plugin.chart.echarts.web.EChartsBarPlot;
-
-
-public class EChartsBar extends AbstractIndependentChartProvider {
-
-    @Override
-    public String getChartName() {
-        return "Plugin-ECharts_Bar";
-    }
-
-    @Override
-    public String getChartUseName() {
-        return Inter.getLocText("Plugin-ECharts_Bar");
-    }
-
-    @Override
-    public Chart[] getChartTypes() {
-        Chart[] charts = new Chart[1];
-        EChartsBarPlot plot = new EChartsBarPlot();
-        Chart barChart = new Chart(plot);
-        barChart.setWrapperName(getWrapperName());
-        charts[0] = barChart;
-        barChart.setRequiredJs(getRequiredJS());
-        barChart.setChartImagePath(this.getChartImagePath());
-        return charts;
-    }
-
-    @Override
-    public String getChartImagePath() {
-        return "com/fr/plugin/chart/echarts/images/bar256.png";
-    }
-
-    @Override
-    public String[] getRequiredJS() {
-        return new String[]{
-                "/com/fr/plugin/chart/echarts/web/echarts-all.js?encode=utf8",
-                "/com/fr/plugin/chart/echarts/web/wrapper.js"
-        };
-    }
-
-    @Override
-    public String getWrapperName() {
-        return "EChartsBarFactory";
-    }
-}
diff --git a/src/com/fr/plugin/chart/echarts/plugin-echarts.iml b/src/com/fr/plugin/chart/echarts/plugin-echarts.iml
deleted file mode 100644
index 1cac898..0000000
--- a/src/com/fr/plugin/chart/echarts/plugin-echarts.iml
+++ /dev/null
@@ -1,36 +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$/../../../../.." 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="fmobile" />
-    <orderEntry type="module" module-name="form" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java b/src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java
new file mode 100644
index 0000000..16d3508
--- /dev/null
+++ b/src/com/fr/solution/plugin/chart/echarts/EChartsFileLoader.java
@@ -0,0 +1,15 @@
+package com.fr.solution.plugin.chart.echarts;
+
+import com.fr.stable.fun.impl.AbstractJavaScriptFileHandler;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class EChartsFileLoader extends AbstractJavaScriptFileHandler {
+    @Override
+    public String[] pathsForFiles() {
+        return new String[]{
+                "/com/fr/solution/plugin/chart/echarts/web/lib/echarts.min.js"
+        };
+    }
+}
diff --git a/src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java b/src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java
new file mode 100644
index 0000000..782be38
--- /dev/null
+++ b/src/com/fr/solution/plugin/chart/echarts/EChartsLocaleFinder.java
@@ -0,0 +1,13 @@
+package com.fr.solution.plugin.chart.echarts;
+
+import com.fr.stable.fun.impl.AbstractLocaleFinder;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class EChartsLocaleFinder extends AbstractLocaleFinder {
+    @Override
+    public String find() {
+        return "/com/fr/solution/plugin/chart/echarts/locale/echarts";
+    }
+}
diff --git a/src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties b/src/com/fr/solution/plugin/chart/echarts/locale/echarts.properties
new file mode 100644
index 0000000..e69de29
diff --git a/src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties b/src/com/fr/solution/plugin/chart/echarts/locale/echarts_zh_CN.properties
new file mode 100644
index 0000000..e69de29
diff --git a/src/com/fr/solution/plugin/chart/echarts/ui/map/ChinaMapChartUI.java b/src/com/fr/solution/plugin/chart/echarts/ui/map/ChinaMapChartUI.java
new file mode 100644
index 0000000..804617f
--- /dev/null
+++ b/src/com/fr/solution/plugin/chart/echarts/ui/map/ChinaMapChartUI.java
@@ -0,0 +1,33 @@
+package com.fr.solution.plugin.chart.echarts.ui.map;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.chart.fun.impl.AbstractIndependentChartUI;
+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;
+
+/**
+ * Created by richie on 16/1/29.
+ */
+public class ChinaMapChartUI extends AbstractIndependentChartUI  {
+    @Override
+    public AbstractChartTypePane getPlotTypePane() {
+        return null;
+    }
+
+    @Override
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
+
+    @Override
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
+
+    @Override
+    public String getIconPath() {
+        return null;
+    }
+}
diff --git a/src/com/fr/plugin/chart/echarts/web/lib/echarts.min.js b/src/com/fr/solution/plugin/chart/echarts/web/lib/echarts.min.js
similarity index 100%
rename from src/com/fr/plugin/chart/echarts/web/lib/echarts.min.js
rename to src/com/fr/solution/plugin/chart/echarts/web/lib/echarts.min.js