From d094681bcd0b6325006a338127bf5023d174d3fc Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Wed, 22 Jan 2025 11:20:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-147166=20=E7=BB=9F=E4=BF=A1uos?= =?UTF-8?q?=E4=B8=8B=E5=88=87=E6=8D=A2=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8D=A1=E7=89=87=E4=B8=8D=E8=83=BD=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/controlpane/JControlUpdatePane.java | 4 +++- .../fr/design/gui/controlpane/ListControlPaneHelper.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java index 3ddb144a5f..fa3c36d6b7 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -14,7 +14,7 @@ import com.fr.form.event.Listener; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import javax.swing.JPanel; +import javax.swing.*; import java.awt.CardLayout; /** @@ -77,6 +77,8 @@ class JControlUpdatePane extends JPanel { cardPane.add(updatePanes[i], String.valueOf(i)); } card.show(cardPane, String.valueOf(i)); + cardPane.revalidate(); + cardPane.repaint(); try { if (ob2Populate instanceof Listener) { listControlPane.wrapperListener((Listener) ob2Populate); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java index 7fe1a27efe..0220a18cfc 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java @@ -145,6 +145,9 @@ class ListControlPaneHelper { ((UIControlPane.PopupEditDialog) popupEditDialog).setTitle(getSelectedName()); } popupEditDialog.setVisible(true); + + popupEditDialog.revalidate(); + popupEditDialog.repaint(); PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class); osBasedAction.register(controlPane, popupEditDialog); } @@ -184,7 +187,7 @@ class ListControlPaneHelper { /* * UINameEdList的鼠标事件 */ - protected MouseListener getListMouseListener(UINameEdList nameableList, UIControlPane controlPane) { + protected MouseListener getListMouseListener(UINameEdList nameableList, UIControlPane controlPane) { return new MouseAdapter() { @Override public void mouseReleased(MouseEvent evt) { @@ -251,5 +254,4 @@ class ListControlPaneHelper { } - } From cb4c39d354a63c6444ec62ad87c0126042902e8b Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Wed, 22 Jan 2025 11:22:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-147166=20=E7=BB=9F=E4=BF=A1uos?= =?UTF-8?q?=E4=B8=8B=E5=88=87=E6=8D=A2=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8D=A1=E7=89=87=E4=B8=8D=E8=83=BD=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/gui/controlpane/JControlUpdatePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java index fa3c36d6b7..404ef27d79 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -14,7 +14,7 @@ import com.fr.form.event.Listener; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import javax.swing.*; +import javax.swing.JPanel; import java.awt.CardLayout; /** From 06128fccc295fff3a3ca92d324ca566af244373b Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 23 Jan 2025 15:43:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-147166=20=E7=BB=9F=E4=BF=A1uos?= =?UTF-8?q?=E4=B8=8B=E5=88=87=E6=8D=A2=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=8D=A1=E7=89=87=E4=B8=8D=E8=83=BD=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/controlpane/JControlUpdatePane.java | 8 +++---- .../present/ConditionAttributesGroupPane.java | 6 +++++ .../ConditionAttributesUpdatePane.java | 22 +++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java index 404ef27d79..980e51b013 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -20,15 +20,15 @@ import java.awt.CardLayout; /** * Created by plough on 2018/8/13. */ -class JControlUpdatePane extends JPanel { +public class JControlUpdatePane extends JPanel { private ListControlPaneProvider listControlPane; private CardLayout card; - private JPanel cardPane; + protected JPanel cardPane; private BasicBeanPane[] updatePanes; private ListModelElement elEditing; - private JControlUpdatePane(ListControlPaneProvider listControlPane) { + protected JControlUpdatePane(ListControlPaneProvider listControlPane) { this.listControlPane = listControlPane; initUpdatePane(); } @@ -77,8 +77,6 @@ class JControlUpdatePane extends JPanel { cardPane.add(updatePanes[i], String.valueOf(i)); } card.show(cardPane, String.valueOf(i)); - cardPane.revalidate(); - cardPane.repaint(); try { if (ob2Populate instanceof Listener) { listControlPane.wrapperListener((Listener) ob2Populate); diff --git a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java index a74cf2d7af..fa15dbea72 100644 --- a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java +++ b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java @@ -22,6 +22,7 @@ import com.fr.report.core.SheetUtils; import com.fr.report.elementcase.TemplateElementCase; import com.fr.stable.Nameable; +import javax.swing.*; import java.util.ArrayList; import java.util.List; @@ -76,6 +77,11 @@ public class ConditionAttributesGroupPane extends UIListControlPane { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Condition"); } + @Override + protected JPanel createControlUpdatePane() { + return ConditionAttributesUpdatePane.newInstance(this); + } + public void populate(ElementCasePane ePane) { this.ePane = ePane; this.editSelection = ePane.getSelection(); diff --git a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java new file mode 100644 index 0000000000..4863452b8c --- /dev/null +++ b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java @@ -0,0 +1,22 @@ +package com.fr.design.present; + +import com.fr.design.gui.controlpane.JControlUpdatePane; +import com.fr.design.gui.controlpane.ListControlPaneProvider; + +public class ConditionAttributesUpdatePane extends JControlUpdatePane { + + protected ConditionAttributesUpdatePane(ListControlPaneProvider listControlPane) { + super(listControlPane); + } + + public static JControlUpdatePane newInstance(ListControlPaneProvider listControlPane) { + return new ConditionAttributesUpdatePane(listControlPane); + } + + public void populate() { + super.populate(); + + cardPane.revalidate(); + cardPane.repaint(); + } +} From c1e113c4a8da3d94def8df3f467fa7070f55f0da Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 23 Jan 2025 15:47:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-147166=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/gui/controlpane/JControlUpdatePane.java | 4 +++- .../present/ConditionAttributesGroupPane.java | 2 +- .../present/ConditionAttributesUpdatePane.java | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java index 980e51b013..56f499e383 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -18,7 +18,9 @@ import javax.swing.JPanel; import java.awt.CardLayout; /** - * Created by plough on 2018/8/13. + * @author plough + * @version 11.0 + * @since Created on 2018/8/13 */ public class JControlUpdatePane extends JPanel { private ListControlPaneProvider listControlPane; diff --git a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java index fa15dbea72..9fa6ba170f 100644 --- a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java +++ b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java @@ -22,7 +22,7 @@ import com.fr.report.core.SheetUtils; import com.fr.report.elementcase.TemplateElementCase; import com.fr.stable.Nameable; -import javax.swing.*; +import javax.swing.JPanel; import java.util.ArrayList; import java.util.List; diff --git a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java index 4863452b8c..5560633b86 100644 --- a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesUpdatePane.java @@ -3,16 +3,30 @@ package com.fr.design.present; import com.fr.design.gui.controlpane.JControlUpdatePane; import com.fr.design.gui.controlpane.ListControlPaneProvider; + +/** + * 条件属性更新面板 + * + * @author lidongy + * @version 11.0 + * @since Created on 2025/1/23 + */ public class ConditionAttributesUpdatePane extends JControlUpdatePane { protected ConditionAttributesUpdatePane(ListControlPaneProvider listControlPane) { super(listControlPane); } + /** + * 新建一个实例 + * @param listControlPane 父面板 + * @return 新面板实例 + */ public static JControlUpdatePane newInstance(ListControlPaneProvider listControlPane) { return new ConditionAttributesUpdatePane(listControlPane); } + @Override public void populate() { super.populate(); From b50209e28c7f8fbba210fdbe4788bb15b64abb94 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 23 Jan 2025 15:53:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-147166=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/gui/controlpane/JControlUpdatePane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java index 56f499e383..77a7fb0650 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -18,6 +18,8 @@ import javax.swing.JPanel; import java.awt.CardLayout; /** + * 设计器控制部分的更新面板 + * * @author plough * @version 11.0 * @since Created on 2018/8/13