diff --git a/designer-base/src/main/java/com/fr/design/gui/chart/ChartXMLTag.java b/designer-base/src/main/java/com/fr/design/gui/chart/ChartXMLTag.java new file mode 100644 index 0000000000..b974287058 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/chart/ChartXMLTag.java @@ -0,0 +1,11 @@ +package com.fr.design.gui.chart; + +/** + * @author Bjorn + * @version 10.0 + * Created by Bjorn on 2021-08-02 + */ +public class ChartXMLTag { + + public static final String CHART_TYPE_UI_PROVIDER = "ChartTypeUIProvider"; +} diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index b50c740a32..a9dcca2a2c 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -157,7 +157,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr @Override public boolean accept(PluginContext context) { - return context.contain(PluginModule.ExtraChartDesign, SpecialLevel.IndependentChartUIProvider.getTagName()); + return context.contain(PluginModule.ExtraChartDesign, SpecialLevel.IndependentChartUIProvider.getTagName()) + || context.contain(PluginModule.ExtraChartDesign, ChartTypeUIProvider.XML_TAG); } }); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java index 9db47e4318..1843a18864 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java @@ -3,6 +3,7 @@ package com.fr.design.chart.fun; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; import com.fr.design.condition.ConditionAttributesPane; +import com.fr.design.gui.chart.ChartXMLTag; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; @@ -22,8 +23,8 @@ import com.fr.stable.fun.Level; * 自定义 图表类型 界面接口 */ public interface ChartTypeUIProvider extends Level { - - String XML_TAG = "ChartTypeUIProvider"; + + String XML_TAG = ChartXMLTag.CHART_TYPE_UI_PROVIDER; String OLD_TAG = SpecialLevel.IndependentChartUIProvider.getTagName(); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index b8f3ff6380..09e02ac670 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -8,6 +8,7 @@ import com.fr.design.designer.beans.events.DesignerEditListener; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.fun.FormWidgetOptionProvider; +import com.fr.design.gui.chart.ChartXMLTag; import com.fr.design.gui.core.FormWidgetOption; import com.fr.design.gui.core.UserDefinedWidgetOption; import com.fr.design.gui.core.WidgetOption; @@ -38,20 +39,20 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.SwingConstants; -import java.awt.Cursor; -import java.awt.event.MouseListener; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Cursor; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; /** * @author null @@ -105,7 +106,8 @@ public class FormParaWidgetPane extends JPanel { public boolean accept(PluginContext context) { return context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG) - || context.contain(PluginModule.ExtraChartDesign, SpecialLevel.IndependentChartUIProvider.getTagName()); + || context.contain(PluginModule.ExtraChartDesign, SpecialLevel.IndependentChartUIProvider.getTagName()) + || context.contain(PluginModule.ExtraChartDesign, ChartXMLTag.CHART_TYPE_UI_PROVIDER); } }); } @@ -246,7 +248,7 @@ public class FormParaWidgetPane extends JPanel { private JPanel createComponentReuseToolPane() { JPanel jPanel = new JPanel(new BorderLayout(17, 10)); UILabel uiLabel = new UILabel(BaseUtils.readIcon("/com/fr/design/images/form/designer/widget_apply_icon.png")); - uiLabel.setBorder(BorderFactory.createEmptyBorder(5, 0 ,5, 0)); + uiLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); jPanel.addMouseListener(new MouseListener() { @Override public void mouseClicked(MouseEvent e) {