Browse Source

Pull request #8528: REPORT-69422 产品调整部分UI

Merge in DESIGN/design from ~YVAN/design:release/11.0 to release/11.0

* commit 'fd6e5906545faeeba9690a38f37f150d9dd58e29':
  REPORT-69422 产品调整部分UI 【问题原因】有些小细节还需要调整下 【改动思路】调整 【review建议】无
bugfix/11.0
Yvan 3 years ago
parent
commit
113a07ea6e
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  2. 10
      designer-base/src/main/java/com/fr/design/gui/ilist/CheckBoxListWithPartialSelect.java

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

@ -1038,7 +1038,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
// 可以半选的CheckBoxList
CheckBoxListWithPartialSelect tableDataCheckBoxPane = new CheckBoxListWithPartialSelect(selectedNameObjects);
UIScrollPane scrollPane = new UIScrollPane(tableDataCheckBoxPane);
UILabel tips = new UILabel("Fine-Design_Basic_Select_Source_To_Remove");
UILabel tips = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Select_Source_To_Remove"));
BasicPane basicPane = new BasicPane() {
@Override
protected String title4PopupWindow() {

10
designer-base/src/main/java/com/fr/design/gui/ilist/CheckBoxListWithPartialSelect.java

@ -51,7 +51,15 @@ public class CheckBoxListWithPartialSelect extends JPanel {
dataList.setCellRenderer(getListCellRenderer());
// 全选框
chooseAllCheckBox = new TristateCheckBox(Toolkit.i18nText("Fine-Design_Basic_Remove_All_Selected"));
chooseAllCheckBox = new TristateCheckBox(Toolkit.i18nText("Fine-Design_Basic_Remove_All_Selected")) {
@Override
protected State getNextState(State current) {
if (current == TristateCheckBox.SELECTED || current == TristateCheckBox.DO_NOT_CARE) {
return TristateCheckBox.NOT_SELECTED;
}
return TristateCheckBox.SELECTED;
}
};
chooseAllCheckBox.setState(TristateCheckBox.SELECTED);
chooseAllCheckBox.setFocusable(false);
chooseAllCheckBox.addStateChangeListener(getChooseAllCheckBoxStateChangeListener());

Loading…
Cancel
Save