Browse Source

Merge pull request #3617 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'e43e80bb24c731f2cee3e84b6a3e540bc565dbbd':
  REPORT-47782 数据集-数据连接-数据集界面的数据连接按钮,鼠标悬浮时的提示不对 【问题原因】数据集查询页面以及服务器数据集页面中的按钮正常状态下没有tooltips,但是UILockButton在初始化的时候会传入一个空字符串,导致会有一个小方格显示出来 【改动思路】把初始化传入的空字符串修改为null,setTooltipsText方法中会判断是否为null,如果是null就会把tooltips隐藏
  CHART-18309 框架图面板边框颜色
bugfix/10.0
superman 4 years ago
parent
commit
e9e72a60bc
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@ -71,7 +71,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
EditLockUtils.CONNECTION_LOCKED_ICON, EditLockUtils.CONNECTION_LOCKED_ICON,
IconUtils.readIcon("/com/fr/design/images/m_web/connection"), IconUtils.readIcon("/com/fr/design/images/m_web/connection"),
EditLockUtils.CONNECTION_LOCKED_TOOLTIPS, EditLockUtils.CONNECTION_LOCKED_TOOLTIPS,
StringUtils.EMPTY null
); );
editButton.setPreferredSize(buttonSize); editButton.setPreferredSize(buttonSize);
editButton.addActionListener(new ActionListener() { editButton.addActionListener(new ActionListener() {

2
designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java

@ -52,7 +52,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
protected Component[][] getPaneComponents() { protected Component[][] getPaneComponents() {
return new Component[][]{ return new Component[][]{
new Component[]{null, null}, new Component[]{null, null},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Node_Radius")), typeComboBox}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), typeComboBox},
new Component[]{null, centerPane}, new Component[]{null, centerPane},
}; };
} }

Loading…
Cancel
Save