From ec34322f895298b89be3ba0f0d8bffb8a10e6eba Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Thu, 9 Jun 2022 11:35:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-73256=20=E6=96=87=E6=9C=AC=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E5=90=8E=E9=9A=90=E8=97=8F=E8=AE=BE=E7=BD=AE=E4=BC=9A?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=8D=95=E5=85=83=E6=A0=BC=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/cell/settingpane/CellOtherSetPane.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java index 742629af0..6e5f1e3bd 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java @@ -79,6 +79,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane { //文本超出时隐藏 private UICheckBox textOverflowCheckBox; + private int curSelectedIndex; private UIComboBox showPartComboBox; private CardLayout showPartLayout; private JPanel showPartPane; @@ -325,7 +326,15 @@ public class CellOtherSetPane extends AbstractCellAttrPane { showPartLayout.show(showPartPane, "none"); showPartPane.setPreferredSize(new Dimension(0, 0)); } + // 记录目前自动调整哪个被选中 + for (int i = 0; i < adjustRadioButtons.length; i++) { + if (adjustRadioButtons[i].isSelected()) { + curSelectedIndex = i; + } + } noAutoRadioButton.setSelected(true); + } else { + adjustRadioButtons[curSelectedIndex].setSelected(true); } } }); From 950d4881a54ec4f2e324261ebdb80dba5959d9d2 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Thu, 9 Jun 2022 11:37:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-73256=20=E6=96=87=E6=9C=AC=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E5=90=8E=E9=9A=90=E8=97=8F=E8=AE=BE=E7=BD=AE=E4=BC=9A?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=8D=95=E5=85=83=E6=A0=BC=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/cell/settingpane/CellOtherSetPane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java index 6e5f1e3bd..4cddfea73 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java @@ -330,6 +330,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane { for (int i = 0; i < adjustRadioButtons.length; i++) { if (adjustRadioButtons[i].isSelected()) { curSelectedIndex = i; + break; } } noAutoRadioButton.setSelected(true);