Browse Source

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

* commit '82364d767f3db3ec16d59c95215ffe5208043544':
  REPORT-28697 边框设置为透明色,无法保存
  REPORT-28351 强转问题 同步到final
  REPORT-28351 强转问题
  REPORT-29003 错误报告问题
  REPORT-28459 JWorkBook 未释放 同步到final
  REPORT-28459 场景补充
  REPORT-28459 JWorkBook未释放问题 同步到final
  REPORT-27434 1.15jar假保存问题 更换下位置。 重构后改动了代码的位置。 没再测试
  REPORT-27434 1.15jar假保存问题 监听装置需要同步刷新
  MOBILE-25615 同步到final
  MOBILE-25493 同步到final
  CHART-12746 埋点
  无JIRA任务 merge错误
  REPORT-25778 json数据集,设计器重启之后消失 换一种处理方式,刷新面板会导致各种诡异的问题
  MOBILE-24587 同步到final
  fix
  REPORT-26085 同步到final
  REPORT-26263 切换远程目录到tomcat,放置一段时间切回本地,出现切换失败的弹窗,实际切换成功 修复 npe 。
  MOBILE-24962 && MOBILE-24940 合到final
feature/big-screen
neil 5 years ago
parent
commit
2104f03a0b
  1. 5
      designer-base/src/main/java/com/fr/design/style/BorderPane.java

5
designer-base/src/main/java/com/fr/design/style/BorderPane.java

@ -14,6 +14,7 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.VerticalFlowLayout; import com.fr.design.layout.VerticalFlowLayout;
import com.fr.design.style.color.ColorSelectBox; import com.fr.design.style.color.ColorSelectBox;
import com.fr.design.style.color.NewColorSelectBox;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.Constants; import com.fr.stable.Constants;
@ -69,7 +70,7 @@ public class BorderPane extends BasicPane {
private JToggleButton rightToggleButton; private JToggleButton rightToggleButton;
private LineComboBox currentLineCombo; private LineComboBox currentLineCombo;
private ColorSelectBox currentLineColorPane; private NewColorSelectBox currentLineColorPane;
private UIButton insidebutton; private UIButton insidebutton;
@ -88,7 +89,7 @@ public class BorderPane extends BasicPane {
verticalToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BorderPane.VERTICAL_BORDER); verticalToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BorderPane.VERTICAL_BORDER);
rightToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BorderPane.RIGHT_BORDER); rightToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BorderPane.RIGHT_BORDER);
this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
this.currentLineColorPane = new ColorSelectBox(100); this.currentLineColorPane = new NewColorSelectBox(100);
this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());

Loading…
Cancel
Save