Browse Source

Merge pull request #5206 in DESIGN/design from release/11.0 to feature/x

* commit '284b6e92fbf1f2c538cae50f466f91b58231e7f2':
  CHART-20134 图表接口判断增加对新接口的判断
  KERNEL-8304  连接池逻辑重构
research/11.0
superman 3 years ago
parent
commit
a1d1b53e1c
  1. 1
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  2. 11
      designer-base/src/main/java/com/fr/design/gui/chart/ChartXMLTag.java
  3. 3
      designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
  4. 5
      designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java
  5. 10
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

1
designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@ -255,6 +255,7 @@ public class JDBCDefPane extends JPanel {
this.dbtypeComboBox.setSelectedItem(OTHER_DB); this.dbtypeComboBox.setSelectedItem(OTHER_DB);
} }
} }
this.jdbcDatabase.setIdentity(jdbcDatabase.getIdentity());
this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver()); this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
this.urlTextField.setText(jdbcDatabase.getURL()); this.urlTextField.setText(jdbcDatabase.getURL());
this.userNameTextField.setText(jdbcDatabase.getUser()); this.userNameTextField.setText(jdbcDatabase.getUser());

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

3
designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@ -157,7 +157,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
@Override @Override
public boolean accept(PluginContext context) { 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);
} }
}); });
} }

5
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.chart.chartattr.Plot;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.gui.chart.ChartXMLTag;
import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
@ -22,8 +23,8 @@ import com.fr.stable.fun.Level;
* 自定义 图表类型 界面接口 * 自定义 图表类型 界面接口
*/ */
public interface ChartTypeUIProvider extends Level { public interface ChartTypeUIProvider extends Level {
String XML_TAG = "ChartTypeUIProvider"; String XML_TAG = ChartXMLTag.CHART_TYPE_UI_PROVIDER;
String OLD_TAG = SpecialLevel.IndependentChartUIProvider.getTagName(); String OLD_TAG = SpecialLevel.IndependentChartUIProvider.getTagName();

10
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.beans.events.DesignerEvent;
import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.designer.creator.XCreatorUtils;
import com.fr.design.fun.FormWidgetOptionProvider; 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.FormWidgetOption;
import com.fr.design.gui.core.UserDefinedWidgetOption; import com.fr.design.gui.core.UserDefinedWidgetOption;
import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOption;
@ -38,20 +39,20 @@ import javax.swing.JComponent;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JSeparator; import javax.swing.JSeparator;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import java.awt.Cursor;
import java.awt.event.MouseListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.awt.event.ComponentAdapter; import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent; import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
/** /**
* @author null * @author null
@ -105,7 +106,8 @@ public class FormParaWidgetPane extends JPanel {
public boolean accept(PluginContext context) { public boolean accept(PluginContext context) {
return context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG) 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() { private JPanel createComponentReuseToolPane() {
JPanel jPanel = new JPanel(new BorderLayout(17, 10)); 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 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() { jPanel.addMouseListener(new MouseListener() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {

Loading…
Cancel
Save