Browse Source

Pull request #12314: REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失

Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0

* commit '6771a4e5c86ee69d500e87210b0426f33b66288a':
  REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
  REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
  REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
  REPORT-97972 回退一下自己代码库的改动
  REPORT-97972 回退一下自己代码库的改动
  REPORT-97972 【FR国际化】文字显示不全
release/11.0
Obo-王学仁 1 year ago
parent
commit
d9d57be83f
  1. 4
      designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java

4
designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java

@ -222,14 +222,18 @@ public class HeaderSortRulePane extends JPanel {
for (SortHeader.SortItem sortItem : sortItems) {
SortRule sortRule = sortItem.getSortRule();
BufferedImage bufferedImage = sortItem.getBufferedImage();
FineColor fineColor = sortItem.getFineColor();
if (sortRule == SortRule.ASC) {
ascIconButton.refreshIconLabel(bufferedImage);
ascIconButton.refreshIconLabelColor(fineColor);
ascUICheckBox.setSelected(true);
} else if (sortRule == SortRule.DES) {
desIconButton.refreshIconLabel(bufferedImage);
desIconButton.refreshIconLabelColor(fineColor);
desUICheckBox.setSelected(true);
} else if (sortRule == SortRule.NO_SORT) {
nosortIconButton.refreshIconLabel(bufferedImage);
nosortIconButton.refreshIconLabelColor(fineColor);
nosortUICheckBox.setSelected(true);
}
}

Loading…
Cancel
Save