From 160b64b8ef8731e9686339a295ddbba03f43cd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Mon, 23 Sep 2019 17:27:38 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1167=20fineKit=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/design/chart/AbstractChartTypeUI.java | 71 ++++++++++++++++ .../api/design/chart/AbstractDataPane.java | 26 ++++++ .../api/design/chart/AbstractOtherPane.java | 31 +++++++ .../api/design/chart/DefaultTypePane.java | 81 +++++++++++++++++++ .../api/design/chart/SingleDataPane.java | 19 +++++ .../field/AbstractCellDataFieldsPane.java | 79 ++++++++++++++++++ .../field/AbstractDataSetFieldsPane.java | 78 ++++++++++++++++++ .../design/ui/component/UIButtonGroup.java | 31 +++++++ .../ui/component/chart/CalculateComboBox.java | 9 +++ .../api/engine/chart/AbstractChartType.java | 41 ++++++++++ .../engine/chart/AbstractChartWithData.java | 70 ++++++++++++++++ .../chart/field/ColumnFieldCollection.java | 12 +++ src/main/java/com/fanruan/api/util/IOKit.java | 14 +++- 13 files changed, 560 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/fanruan/api/design/chart/AbstractChartTypeUI.java create mode 100644 src/main/java/com/fanruan/api/design/chart/AbstractDataPane.java create mode 100644 src/main/java/com/fanruan/api/design/chart/AbstractOtherPane.java create mode 100644 src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java create mode 100644 src/main/java/com/fanruan/api/design/chart/SingleDataPane.java create mode 100644 src/main/java/com/fanruan/api/design/chart/field/AbstractCellDataFieldsPane.java create mode 100644 src/main/java/com/fanruan/api/design/chart/field/AbstractDataSetFieldsPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UIButtonGroup.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/chart/CalculateComboBox.java create mode 100644 src/main/java/com/fanruan/api/engine/chart/AbstractChartType.java create mode 100644 src/main/java/com/fanruan/api/engine/chart/AbstractChartWithData.java create mode 100644 src/main/java/com/fanruan/api/engine/chart/field/ColumnFieldCollection.java diff --git a/src/main/java/com/fanruan/api/design/chart/AbstractChartTypeUI.java b/src/main/java/com/fanruan/api/design/chart/AbstractChartTypeUI.java new file mode 100644 index 0000000..5b4c653 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/AbstractChartTypeUI.java @@ -0,0 +1,71 @@ +package com.fanruan.api.design.chart; + +import com.fr.design.gui.frpane.AttributeChangeListener; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-19 + */ +public abstract class AbstractChartTypeUI extends com.fr.design.chart.fun.impl.AbstractChartTypeUI { + + /** + * 定义图表类型选择界面 + * + * @return 类型选择界面 + */ + @Override + public DefaultTypePane getPlotTypePane() { + return new DefaultTypePane(); + } + + /** + * 定义图表数据配置界面 + * + * @return 数据配置界面 + */ + @Override + public abstract AbstractDataPane getChartDataPane(AttributeChangeListener listener); + + /** + * 定义其他界面 + * + * @return 其他界面集合 + */ + @Override + public abstract AbstractOtherPane[] getAttrPaneArray(AttributeChangeListener listener); + + /** + * 定义图表类型选择界面子类型的名称 + * + * @return 图表子类型名称集合 + */ + @Override + public String[] getSubName() { + return super.getSubName(); + } + + /** + * 定义图表的icon图片路径 + * + * @return icon图片路径 + */ + @Override + public abstract String getIconPath(); + + /** + * 定义图表图表类型选择界面的类型名称 + * + * @return 图表类型名称 + */ + @Override + public abstract String getName(); + + /** + * 定义图表类型选择界面子类型的示例图片路径 + * + * @return 图表子类型图片路径集合 + */ + @Override + public abstract String[] getDemoImagePath(); +} diff --git a/src/main/java/com/fanruan/api/design/chart/AbstractDataPane.java b/src/main/java/com/fanruan/api/design/chart/AbstractDataPane.java new file mode 100644 index 0000000..5e97167 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/AbstractDataPane.java @@ -0,0 +1,26 @@ +package com.fanruan.api.design.chart; + +import com.fr.design.gui.frpane.AttributeChangeListener; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-18 + */ +public abstract class AbstractDataPane extends com.fr.design.chartx.impl.AbstractDataPane { + + /** + * 构造函数 + */ + public AbstractDataPane(AttributeChangeListener listener) { + super(listener); + } + + + /** + * 创建数据配置面板 + * + * @return 数据配置面板 + */ + protected abstract SingleDataPane createSingleDataPane(); +} diff --git a/src/main/java/com/fanruan/api/design/chart/AbstractOtherPane.java b/src/main/java/com/fanruan/api/design/chart/AbstractOtherPane.java new file mode 100644 index 0000000..556ad4a --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/AbstractOtherPane.java @@ -0,0 +1,31 @@ +package com.fanruan.api.design.chart; + +import com.fanruan.api.engine.chart.AbstractChartWithData; + +import javax.swing.JPanel; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-17 + */ +public abstract class AbstractOtherPane extends com.fr.design.chartx.impl.AbstractOtherPane { + + /** + * 创建内容面板 + * + * @return 面板 + */ + @Override + protected abstract JPanel createContentPane(); + + /** + * 界面标题 + * + * @return 标题 + */ + @Override + public String title4PopupWindow() { + return super.title4PopupWindow(); + } +} diff --git a/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java b/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java new file mode 100644 index 0000000..16001f3 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java @@ -0,0 +1,81 @@ +package com.fanruan.api.design.chart; + +import com.fanruan.api.engine.chart.AbstractChartWithData; +import com.fr.chartx.attr.ChartProvider; + +import javax.swing.JPanel; +import java.awt.Component; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-18 + */ +public class DefaultTypePane extends com.fr.design.chartx.impl.DefaultTypePane { + + /** + * 获取图表类型界面图表选择子类型的缩略图路径，默认使用UI界面插入图表时子类型的图片路径 + * + * @return 图片路径集合 + */ + @Override + protected String[] getTypeIconPath() { + return super.getTypeIconPath(); + } + + /** + * 获取图表类型界面图表选择子类型的缩略图提示内容，默认使用UI界面插入图表时的图表子类型名称 + * + * @return 提示内容集合 + */ + @Override + protected String[] getTypeTipName() { + return super.getTypeTipName(); + } + + /** + * 获取图表子类型对象，默认使用AbstractChartType.getChartTypes()返回的第一个对象 + * + * @return 图表对象 + */ + @Override + public ChartProvider getDefaultChart() { + return super.getDefaultChart(); + } + + /** + * 获取图表类型界面切换图表类型名称。默认使用UI界面插入图表时的图表名称。 + * + * @return 图表名称 + */ + @Override + public String title4PopupWindow() { + return super.title4PopupWindow(); + } + + /** + * 根据图表对象返回该图表对象的所对应的子类型序号，默认返回0 + * + * @return 子类型序号 + */ + @Override + protected int getSelectIndexInChart(T chart) { + return super.getSelectIndexInChart(chart); + } + + /** + * 根据图表子类型序号，还原图表对象对应的属性。 + */ + @Override + protected void setSelectIndexInChart(T chart, int index) { + super.setSelectIndexInChart(chart, index); + } + + /** + * 根据图表子类型序号，还原图表对象对应的属性。 + */ + @Override + protected Component[][] getPaneComponents(JPanel typePane) { + return super.getPaneComponents(typePane); + } +} diff --git a/src/main/java/com/fanruan/api/design/chart/SingleDataPane.java b/src/main/java/com/fanruan/api/design/chart/SingleDataPane.java new file mode 100644 index 0000000..29db9b9 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/SingleDataPane.java @@ -0,0 +1,19 @@ +package com.fanruan.api.design.chart; + +import com.fanruan.api.design.chart.field.AbstractCellDataFieldsPane; +import com.fanruan.api.design.chart.field.AbstractDataSetFieldsPane; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-18 + */ +public class SingleDataPane extends com.fr.design.chartx.single.SingleDataPane { + + /** + * 构造函数，组合数据集数据源配置面板和单元格数据源配置面板 + */ + public SingleDataPane(AbstractDataSetFieldsPane dataSetFieldsPane, AbstractCellDataFieldsPane cellDataFieldsPane) { + super(dataSetFieldsPane, cellDataFieldsPane); + } +} diff --git a/src/main/java/com/fanruan/api/design/chart/field/AbstractCellDataFieldsPane.java b/src/main/java/com/fanruan/api/design/chart/field/AbstractCellDataFieldsPane.java new file mode 100644 index 0000000..0247d9f --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/field/AbstractCellDataFieldsPane.java @@ -0,0 +1,79 @@ +package com.fanruan.api.design.chart.field; + +import com.fanruan.api.design.ui.component.formula.UIFormulaTextField; +import com.fanruan.api.engine.chart.field.ColumnFieldCollection; + +import javax.swing.JPanel; +import java.awt.Component; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-17 + */ +public abstract class AbstractCellDataFieldsPane extends com.fr.design.chartx.fields.AbstractCellDataFieldsPane { + + /** + * 初始化面板布局，默认会加载北部、中部和南部的面板 + */ + @Override + protected void initComponents() { + super.initComponents(); + } + + /** + * 创建中部位置的面板，默认会通过所有的组件和组件名称生成面板。 + * + * @return 面板 + */ + @Override + protected JPanel createCenterPane() { + return super.createCenterPane(); + } + + /** + * 创建北部位置的面板，默认生成空面板 + * + * @return 面板 + */ + @Override + protected JPanel createNorthPane() { + return super.createNorthPane(); + } + + /** + * 创建南部位置的面板，默认生成空面板 + * + * @return 面板 + */ + @Override + protected JPanel createSouthPane() { + return super.createSouthPane(); + } + + /** + * 面板中所有组件，默认会去获取所有公式组件 + * + * @return 所有组件的集合 + */ + @Override + protected Component[] fieldComponents() { + return super.fieldComponents(); + } + + /** + * 面板中所有组件的名称 + * + * @return 所有组件的名称集合 + */ + @Override + protected abstract String[] fieldLabels(); + + /** + * 面板中的公式组件 + * + * @return 公式组件的集合 + */ + @Override + protected abstract UIFormulaTextField[] formulaPanes(); +} diff --git a/src/main/java/com/fanruan/api/design/chart/field/AbstractDataSetFieldsPane.java b/src/main/java/com/fanruan/api/design/chart/field/AbstractDataSetFieldsPane.java new file mode 100644 index 0000000..5e2169e --- /dev/null +++ b/src/main/java/com/fanruan/api/design/chart/field/AbstractDataSetFieldsPane.java @@ -0,0 +1,78 @@ +package com.fanruan.api.design.chart.field; + +import com.fanruan.api.design.ui.component.UIComboBox; +import com.fanruan.api.engine.chart.field.ColumnFieldCollection; + +import javax.swing.JPanel; +import java.awt.Component; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-17 + */ +public abstract class AbstractDataSetFieldsPane extends com.fr.design.chartx.fields.AbstractDataSetFieldsPane { + /** + * 初始化面板布局，默认会加载北部、中部和南部的面板 + */ + @Override + protected void initComponents() { + super.initComponents(); + } + + /** + * 创建中部位置的面板，默认会通过所有的组件和组件名称生成面板。 + * + * @return 面板 + */ + @Override + protected JPanel createCenterPane() { + return super.createCenterPane(); + } + + /** + * 创建北部位置的面板，默认生成空面板 + * + * @return 面板 + */ + @Override + protected JPanel createNorthPane() { + return super.createNorthPane(); + } + + /** + * 创建南部位置的面板，默认生成空面板 + * + * @return 面板 + */ + @Override + protected JPanel createSouthPane() { + return super.createSouthPane(); + } + + /** + * 面板中所有组件,默认会去获取所有下拉框组件 + * + * @return 所有组件的集合 + */ + @Override + protected Component[] fieldComponents() { + return super.fieldComponents(); + } + + /** + * 面板中所有组件的名称 + * + * @return 所有组件的名称集合 + */ + @Override + protected abstract String[] fieldLabels(); + + /** + * 面板中的下拉框组件 + * + * @return 下拉框组件的集合 + */ + @Override + protected abstract UIComboBox[] filedComboBoxes(); +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UIButtonGroup.java b/src/main/java/com/fanruan/api/design/ui/component/UIButtonGroup.java new file mode 100644 index 0000000..4af87f9 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UIButtonGroup.java @@ -0,0 +1,31 @@ +package com.fanruan.api.design.ui.component; + +import javax.swing.Icon; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-19 + */ +public class UIButtonGroup extends com.fr.design.gui.ibutton.UIButtonGroup { + + public UIButtonGroup(String[] textArray) { + super(textArray); + } + + public UIButtonGroup(Icon[] iconArray) { + super(iconArray); + } + + public UIButtonGroup(Icon[][] iconArray) { + super(iconArray); + } + + public UIButtonGroup(Icon[] iconArray, T[] objects) { + super(iconArray, objects); + } + + public UIButtonGroup(Icon[][] iconArray, T[] objects) { + super(iconArray, objects); + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/chart/CalculateComboBox.java b/src/main/java/com/fanruan/api/design/ui/component/chart/CalculateComboBox.java new file mode 100644 index 0000000..88c459d --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/chart/CalculateComboBox.java @@ -0,0 +1,9 @@ +package com.fanruan.api.design.ui.component.chart; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-23 + */ +public class CalculateComboBox extends com.fr.design.mainframe.chart.gui.data.CalculateComboBox { +} diff --git a/src/main/java/com/fanruan/api/engine/chart/AbstractChartType.java b/src/main/java/com/fanruan/api/engine/chart/AbstractChartType.java new file mode 100644 index 0000000..e84b71e --- /dev/null +++ b/src/main/java/com/fanruan/api/engine/chart/AbstractChartType.java @@ -0,0 +1,41 @@ +package com.fanruan.api.engine.chart; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-17 + */ +public abstract class AbstractChartType extends com.fr.chart.impl.AbstractChartType { + + /** + * 该种图表所有的图表对象实例，比如柱形图就有堆积柱形图，百分比堆积柱形图等等 + * + * @return 图表所有的对象实例 + */ + @Override + public abstract AbstractChartWithData[] getChartTypes(); + + /** + * 图表在web端展现时需要的JS文件路径 + * + * @return JS文件路径数组 + */ + @Override + public abstract String[] getRequiredJS(); + + /** + * 图表在web端展现时需要的CSS文件路径 + * + * @return CSS文件路径数组 + */ + @Override + public abstract String[] getRequiredCss(); + + /** + * JS对象名，该对象一般是一个函数，执行后会在给定的dom中绘制图表 + * + * @return JS对象名 + */ + @Override + public abstract String getWrapperName(); +} diff --git a/src/main/java/com/fanruan/api/engine/chart/AbstractChartWithData.java b/src/main/java/com/fanruan/api/engine/chart/AbstractChartWithData.java new file mode 100644 index 0000000..41df1ea --- /dev/null +++ b/src/main/java/com/fanruan/api/engine/chart/AbstractChartWithData.java @@ -0,0 +1,70 @@ +package com.fanruan.api.engine.chart; + +import com.fanruan.api.engine.chart.field.ColumnFieldCollection; +import com.fr.base.chart.cross.FormulaProcessor; +import com.fr.chart.ChartWebPara; +import com.fr.js.NameJavaScriptGroup; +import com.fr.json.JSONObject; + +import java.awt.Image; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-17 + */ +public abstract class AbstractChartWithData extends com.fr.chart.impl.AbstractChartWithData { + + /** + * 获取所有的超链 + * + * @return 超链集合 + */ + @Override + public NameJavaScriptGroup getHotHyperlink(String linkKey) { + return super.getHotHyperlink(linkKey); + } + + /** + * 处理公式，调用formulaProcessor.dealWith方法，覆写该方法需要调用父类的方法。 + */ + @Override + public void dealFormula(FormulaProcessor formulaProcessor) { + super.dealFormula(formulaProcessor); + } + + /** + * 生成设计器中显示的图片，默认返回一个饼图的图片 + * + * @return 图片 + */ + @Override + public Image toImage(int width, int height, int resolution, ChartWebPara chartWebPara) { + return super.toImage(width, height, resolution, chartWebPara); + } + + /** + * 生成图表预览的options + * + * @return JSON对象 + */ + @Override + public abstract JSONObject createAttributeConfig(ChartWebPara chartWebPara); + + /** + * 定义图表的ID，与plugin.xml中的chartID对应 + * + * @return ID + */ + @Override + public abstract String getID(); + + /** + * 获取字段集合对象 + * + * @return 字段集合对象 + */ + public T getColumnFieldCollection(Class var1) { + return super.getFieldCollection(var1); + } +} diff --git a/src/main/java/com/fanruan/api/engine/chart/field/ColumnFieldCollection.java b/src/main/java/com/fanruan/api/engine/chart/field/ColumnFieldCollection.java new file mode 100644 index 0000000..974ba47 --- /dev/null +++ b/src/main/java/com/fanruan/api/engine/chart/field/ColumnFieldCollection.java @@ -0,0 +1,12 @@ +package com.fanruan.api.engine.chart.field; + +import com.fr.chartx.data.field.AbstractColumnFieldCollection; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2019-09-17 + */ +public class ColumnFieldCollection extends AbstractColumnFieldCollection { + +} diff --git a/src/main/java/com/fanruan/api/util/IOKit.java b/src/main/java/com/fanruan/api/util/IOKit.java index d7b560d..acc311c 100644 --- a/src/main/java/com/fanruan/api/util/IOKit.java +++ b/src/main/java/com/fanruan/api/util/IOKit.java @@ -4,8 +4,7 @@ import com.fr.general.CommonIOUtils; import com.fr.general.IOUtils; import com.fr.io.utils.ResourceIOUtils; -import javax.swing.*; -import java.awt.image.BufferedImage; +import javax.swing.Icon; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -15,6 +14,7 @@ import java.io.UnsupportedEncodingException; import java.io.Writer; import java.nio.channels.Channel; import java.nio.charset.Charset; +import java.awt.image.BufferedImage; /** * @author richie @@ -173,6 +173,16 @@ public class IOKit { return IOUtils.readImage(resource); } + /** + * 直接从磁盘中读取图片,并对图片进行缓存 + * + * @param resource 图片的路径 + * @return 图片 + */ + public static BufferedImage readImageWithCache(String resource) { + return IOUtils.readImageWithCache(resource); + } + /** * 读取图标，该方法启用了缓存 *