From 444633f5ff66e8f86ec7004083b81ba42aecfc4e Mon Sep 17 00:00:00 2001 From: Yvan Date: Mon, 11 Apr 2022 18:54:09 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-69422=20=E4=BA=A7=E5=93=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=83=A8=E5=88=86UI=20=E3=80=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=91=E6=9C=89=E4=BA=9B=E5=B0=8F=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E8=BF=98=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4=E4=B8=8B?= =?UTF-8?q?=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E3=80=90review=E5=BB=BA=E8=AE=AE=E3=80=91?= =?UTF-8?q?=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/TableDataTreePane.java | 2 +- .../gui/ilist/CheckBoxListWithPartialSelect.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 739cbdeee9..283aa0772a 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/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() { diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/CheckBoxListWithPartialSelect.java b/designer-base/src/main/java/com/fr/design/gui/ilist/CheckBoxListWithPartialSelect.java index 3304073df4..88d98991d6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/CheckBoxListWithPartialSelect.java +++ b/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());