From 04eeb7ff16e428f435379c7a0c25ee8b2e3c2508 Mon Sep 17 00:00:00 2001 From: "coral.chen@fanruan.com" Date: Tue, 9 May 2023 14:21:26 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-95156=20=E3=80=90FR=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E3=80=91=E6=8A=A5=E8=A1=A8=E5=9D=97=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E7=A7=BB=E5=8A=A8=E7=AB=AF"=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=AF=E9=80=89=E4=B8=AD"=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E5=8F=98=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=92=A4?= =?UTF-8?q?=E9=94=80=E5=BC=82=E5=B8=B8=20=E3=80=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=91=20ElementCaseDefinePane=20=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96panel=E7=9A=84=E6=97=B6=E5=80=99=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=BB=99=E4=BA=86=E4=B8=AAtrue=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=8B=96=E5=8A=A8=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E9=9D=A2=E6=9D=BF=E5=88=B7=E6=96=B0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=9C=AA=E9=80=89=E4=B8=AD=E8=BF=99=E4=B8=AAcheckbox=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E6=88=90=E4=BA=86=E7=8A=B6=E6=80=81=E5=8F=91=E7=94=9F?= =?UTF-8?q?=E4=BA=86=E5=8F=98=E5=8C=96=EF=BC=8CundoState=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E5=B0=B1=E4=B8=8D=E5=A4=AA=E5=AF=B9?= =?UTF-8?q?=E3=80=82=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF?= =?UTF-8?q?=E3=80=91=20=E4=B8=A4=E7=A7=8D=E6=94=B9=E6=B3=95=EF=BC=9A=20?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E8=A6=81=E6=A0=B9=E6=8D=AE=E4=BC=A0=E8=BF=9B=E6=9D=A5=E7=9A=84?= =?UTF-8?q?FormDesigner=E6=9D=A5=E6=B8=B2=E6=9F=93checkbox=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E3=80=82=20=E7=BB=84=E4=BB=B6=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E8=A6=81=E6=94=BE=E5=9C=A8=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=8F=82=E8=80=83=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=9D=97=EF=BC=8C=E6=94=BE=E5=9C=A8pupolate=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E3=80=82=EF=BC=88?= =?UTF-8?q?=E9=80=89=E8=BF=99=E4=B8=AA=EF=BC=89=20=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=92=A4=E9=94=80=E5=AF=BC=E8=87=B4=E4=B8=A4?= =?UTF-8?q?=E7=A7=8D=E7=8A=B6=E6=80=81=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=98=AF=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E8=AE=B0=E5=BD=95undo=E7=8A=B6=E6=80=81=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E9=9D=A0=E5=89=8D=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E8=BF=98=E6=B2=A1=E6=9C=89=E5=8F=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=B0=B1=E8=A2=AB=E8=AE=B0=E5=BD=95=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E8=BF=99=E4=B8=AA=E4=BD=8D=E7=BD=AE=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E4=B8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/ui/designer/mobile/ElementCaseDefinePane.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java index bdd5b7d351..7ee106a9fc 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java @@ -22,7 +22,6 @@ import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.mobile.ui.MobileCollapsedStyleExpandPane; import com.fr.design.mainframe.mobile.ui.MobileComboBoxDialogEditor; import com.fr.form.ui.ElementCaseEditor; - import com.fr.form.ui.mobile.MobileCollapsedStyle; import com.fr.stable.StringUtils; @@ -30,7 +29,9 @@ import javax.swing.BorderFactory; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingConstants; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; /** * 报表块-移动端属性面板 @@ -123,7 +124,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane { panelWrapper.add(panel, BorderLayout.NORTH); UIExpandablePane folderPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit"), 280, 20, panelWrapper); this.add(folderPane, BorderLayout.NORTH); - this.bingListeners2Widgets(); this.setGlobalNames(); this.repaint(); } @@ -178,6 +178,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane { this.mobileCollapsedStyleEditor.setStyle(elementCaseEditor.getMobileCollapsedStyle()); fix(elementCaseEditor.getMobileCollapsedStyle()); this.mobileCollapsedStyleEditor.setSelected(elementCaseEditor.getMobileCollapsedStyle().isCollapsedWork()); + this.bingListeners2Widgets(); } /** @@ -191,7 +192,6 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane { @Override public void update() { - DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来 String globalName = this.getGlobalName(); switch (globalName) { case "hComboBox": @@ -220,6 +220,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane { style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator)); ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style); } + DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来 } private void setGlobalNames() {