From 34cbc22da1ccc9f23f8b89c938aa2f8cd2a157c4 Mon Sep 17 00:00:00 2001 From: renekton Date: Fri, 20 Sep 2024 16:25:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=8E=BB?= =?UTF-8?q?=E6=8E=89html=E6=8D=A2=E8=A1=8C&=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BFweb=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E5=AF=BC=E5=87=BA=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/WidgetThemeDisplayConfigPane.java | 8 +++++--- .../java/com/fr/design/javascript/ListenerEditPane.java | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java index 62f460d8fe..532eb8f532 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java @@ -1,5 +1,7 @@ package com.fr.widgettheme.designer; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; @@ -9,6 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr; import javax.swing.JPanel; +import javax.swing.JTextArea; import java.awt.BorderLayout; import java.awt.Color; @@ -39,9 +42,8 @@ public class WidgetThemeDisplayConfigPane extends BasicPane { northPane.add(row(cell(widgetEnhance)).getComponent()); JPanel southPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance_Tip")); - label.setForeground(Color.GRAY); - southPane.add(label); + JTextArea tipText = FineUIUtils.createAutoWrapTipLabel(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance_Tip")); + southPane.add(tipText); this.add(column(10, cell(northPane), cell(southPane)).getComponent()); } diff --git a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java index 643ba75175..d54b8d5522 100644 --- a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java @@ -73,12 +73,13 @@ public class ListenerEditPane extends BasicBeanPane { nameText = new UITextField(); nameText.setEditable(false); final List style = new ArrayList<>(Arrays.asList(JS, DBCOMMIT, CUSTOMACTION, EMAIL, MOBILEPOPUP)); - styleBox = new UIComboBox(style.toArray()); - styleBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX); boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook(); if (workbook) { style.add(EXPORT); } + styleBox = new UIComboBox(style.toArray()); + styleBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX); + //事件名 JPanel eventName = row(LayoutConstants.HGAP_LARGE, cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Name"))), From a997b63eac956e875c62a647ccf21d007764a818 Mon Sep 17 00:00:00 2001 From: renekton Date: Fri, 20 Sep 2024 17:13:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=A1=A8=E6=A0=BC=E5=8F=B3=E4=BE=A7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/write/submit/DBManipulationPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 01dafb590b..59a58f52d8 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -219,7 +219,7 @@ public class DBManipulationPane extends BasicBeanPane { if (actions != null && actions.length > 0) { JPanel controlBtnPane = new JPanel(new BorderLayout()); editTablePane.add(GUICoreUtils.createBorderPane(controlBtnPane, BorderLayout.NORTH), BorderLayout.EAST); - List buttonGroup = Arrays.stream(actions).map(action -> cell(new UIButton(action))).collect(Collectors.toList()); + List buttonGroup = Arrays.stream(actions).map(action -> cell(new UIButton(action)).with(it -> it.setPreferredSize(scale(new Dimension(122, 22))))).collect(Collectors.toList()); checkBoxUpdatePane = new JPanel(new BorderLayout(0, 0)); checkBoxUpdatePane.setPreferredSize(scale(new Dimension(120, 20))); From 021977e0929a45f425ecdf7742ee9e22f0bb15a5 Mon Sep 17 00:00:00 2001 From: renekton Date: Fri, 20 Sep 2024 18:14:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/write/submit/DBManipulationPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 59a58f52d8..01dafb590b 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -219,7 +219,7 @@ public class DBManipulationPane extends BasicBeanPane { if (actions != null && actions.length > 0) { JPanel controlBtnPane = new JPanel(new BorderLayout()); editTablePane.add(GUICoreUtils.createBorderPane(controlBtnPane, BorderLayout.NORTH), BorderLayout.EAST); - List buttonGroup = Arrays.stream(actions).map(action -> cell(new UIButton(action)).with(it -> it.setPreferredSize(scale(new Dimension(122, 22))))).collect(Collectors.toList()); + List buttonGroup = Arrays.stream(actions).map(action -> cell(new UIButton(action))).collect(Collectors.toList()); checkBoxUpdatePane = new JPanel(new BorderLayout(0, 0)); checkBoxUpdatePane.setPreferredSize(scale(new Dimension(120, 20)));