fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #14865: REPORT-134842 & REPORT-134740 fix:存储过程命名交互问题 & 日期下拉框问题 

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release

* commit '4a5c3d8e2727052201035b5bd3640d391dcb3656':
  无jira 漏翻面板整改
  REPORT-134842 & REPORT-134740 fix:存储过程命名交互问题 & 日期下拉框问题
fbp/merge
Levy.Xie-解安森 5 months ago
parent
4905bb46c8 4a5c3d8e27
commit
dead79e856
3 changed files with 55 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  2. 51
      designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java
  3. 50
      designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

10
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
Unescape View File

@ -81,7 +81,6 @@ import javax.swing.JScrollBar;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import javax.swing.ToolTipManager; import javax.swing.ToolTipManager;
import javax.swing.border.EmptyBorder;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
@ -509,11 +508,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
} else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) { } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) {
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName)); nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
dg.setButtonEnabled(false); dg.setButtonEnabled(false);
} else if (oldName.length() >= PROCEDURE_NAME_INDEX && tableDataPane.updateBean() instanceof MultiResultTableData) { } else if (oldName.length() >= PROCEDURE_NAME_INDEX && tableDataPane.updateBean() instanceof MultiResultTableData
if (isIncludeUnderline(tempName)) { && isIncludeUnderline(tempName)) {
nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multi_Result_Table_Data_Name_Tips")); nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multi_Result_Table_Data_Name_Tips"));
dg.setButtonEnabled(false); dg.setButtonEnabled(false);
}
} else if (!BasicTableDataUtils.checkName(tempName)) { } else if (!BasicTableDataUtils.checkName(tempName)) {
dg.setButtonEnabled(false); dg.setButtonEnabled(false);
} else { } else {

51
designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java
Unescape View File

@ -1,10 +1,7 @@
package com.fr.design.gui.date; package com.fr.design.gui.date;
import com.fine.theme.icon.LazyIcon; import com.fine.theme.light.ui.FineComboBoxUI;
import com.fine.theme.utils.FineUIStyle;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxUI;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
@ -13,6 +10,7 @@ import com.fr.stable.StringUtils;
import com.fr.design.carton.FeedbackToolboxDialog; import com.fr.design.carton.FeedbackToolboxDialog;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -26,6 +24,7 @@ import javax.swing.plaf.basic.ComboPopup;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.LayoutManager; import java.awt.LayoutManager;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.io.Serializable; import java.io.Serializable;
import java.text.ParseException; import java.text.ParseException;
@ -292,40 +291,44 @@ public class UIDatePicker extends UIComboBox implements Serializable {
@Override @Override
protected ComboBoxUI getUIComboBoxUI() { protected ComboBoxUI getUIComboBoxUI() {
return new UIComboBoxUI() {
return new FineComboBoxUI() {
@Override @Override
protected UIButton createArrowButton() { protected JButton createArrowButton() {
arrowButton = new UIButton(new LazyIcon("down_arrow")) { JButton button = super.createArrowButton();
public boolean shouldResponseChangeListener() { button.addMouseListener(getPopupMouseAdapter());
return false; return button;
}
};
arrowButton.addMouseListener(this);
comboBox.addMouseListener(this);
FineUIStyle.setStyle(arrowButton, FineUIStyle.PLAIN_BUTTON);
return (UIButton) arrowButton;
} }
@Override @Override
protected ComboPopup createPopup() { protected ComboPopup createPopup() {
return new DatePopup(comboBox); return new DatePopup(comboBox);
} }
@Override @Override
public void mousePressed(MouseEvent e) { protected void installListeners() {
if (UIDatePicker.this.isPopupVisible()) { super.installListeners();
willHide = true; comboBox.addMouseListener(getPopupMouseAdapter());
UIDatePicker.this.hidePopup(); }
} else {
willHide = false; MouseAdapter getPopupMouseAdapter() {
UIDatePicker.this.showPopup(); return new MouseAdapter() {
} @Override
public void mousePressed(MouseEvent e) {
if (UIDatePicker.this.isPopupVisible()) {
willHide = true;
UIDatePicker.this.hidePopup();
} else {
willHide = false;
UIDatePicker.this.showPopup();
}
}
};
} }
}; };
} }
//设置dataFormat //设置dataFormat
public void setDateFormat(SimpleDateFormat format){ public void setDateFormat(SimpleDateFormat format){
this.dateFormat = format; this.dateFormat = format;

50
designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java
Unescape View File

@ -1,6 +1,9 @@
package com.fr.design.chartx.component; package com.fr.design.chartx.component;
import com.fine.theme.icon.LazyIcon; import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineLayoutBuilder;
import com.fine.theme.utils.FineUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.chartx.TwoTuple; import com.fr.chartx.TwoTuple;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.data.TableDataSourceTailor; import com.fr.data.TableDataSourceTailor;
@ -31,19 +34,24 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
import static com.fine.theme.utils.FineUIScale.scale;
/** /**
* @author Bjorn * @author Bjorn
* @version 10.0 * @version 10.0
@ -67,49 +75,39 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
initButtonGroup(); initButtonGroup();
initRefreshLabel(); initRefreshLabel();
areaNameBox = new UIComboBox(); areaNameBox = new UIComboBox();
this.setLayout(new BorderLayout(5, 5)); this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10));
this.add(createContentPane(), BorderLayout.NORTH); this.add(createContentPane(), BorderLayout.NORTH);
initTable(treeNodeAndItems); initTable(treeNodeAndItems);
JPanel tablePane = new JPanel(); JPanel tablePane = new JPanel();
tablePane.setLayout(new BorderLayout(5, 10)); tablePane.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10));
tablePane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
JScrollPane matchAreaScroll = new JScrollPane(matchAreaTable) { JScrollPane matchAreaScroll = new JScrollPane(matchAreaTable) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(400, 290); return scale(new Dimension(400, 290));
} }
}; };
tablePane.add(matchAreaScroll, BorderLayout.CENTER); tablePane.add(matchAreaScroll, BorderLayout.CENTER);
JScrollPane matchResultScroll = new JScrollPane(matchResultTable) { JScrollPane matchResultScroll = new JScrollPane(matchResultTable){
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(400, 200); return scale(new Dimension(400, 200));
} }
}; };
matchResultScroll.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Custom_Match_List"))); Component matchResult = FineUIUtils.wrapComponentWithTitle(matchResultScroll, Toolkit.i18nText("Fine-Design_Chart_Custom_Match_List"));
tablePane.add(matchResultScroll, BorderLayout.SOUTH); tablePane.add(matchResult, BorderLayout.SOUTH);
this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
this.add(tablePane, BorderLayout.CENTER); this.add(tablePane, BorderLayout.CENTER);
} }
private JPanel createContentPane() { private JPanel createContentPane() {
JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); tableNameCombox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
areaNameBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); return FineLayoutBuilder.createHorizontalLayout(10,
panel.add(tableDataPane); new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":"), tableNameCombox,
tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")); new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"), areaNameBox,
tableNameCombox.setPreferredSize(new Dimension(96, 20)); refreshLabel);
tableDataPane.add(tableNameCombox);
JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
panel.add(areaNamePane);
areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"));
areaNamePane.add(areaNameBox);
areaNameBox.setPreferredSize(new Dimension(96, 20));
panel.add(refreshLabel);
return panel;
} }
private void initTable(TwoTuple<DefaultMutableTreeNode, Set<String>> treeNodeAndItems) { private void initTable(TwoTuple<DefaultMutableTreeNode, Set<String>> treeNodeAndItems) {

Write Preview
Loading…
Cancel
Save