From e15fd39f0a297573ff0e631178f13275dd776506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 26 Sep 2024 16:00:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-135889=20fix:NewUI=E8=87=AA=E6=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fine/theme/utils/FineUIStyle.java | 1 + .../com/fr/design/condition/ConditionAttributesPane.java | 4 ++-- .../design/gui/controlpane/UIListGroupControlPane.java | 6 ++---- .../java/com/fr/design/gui/frpane/UINumberDragPane.java | 7 +++---- .../src/main/java/com/fr/design/utils/ColorUtils.java | 9 +++++++++ .../src/main/java/com/fr/design/web/CustomIconPane.java | 4 ++-- .../com/fine/theme/light/ui/laf/FineLightLaf.properties | 3 +++ .../main/java/com/fr/design/report/ReportEnginePane.java | 3 ++- 8 files changed, 24 insertions(+), 13 deletions(-) diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java index 03d50ac371..05e55df51d 100644 --- a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java @@ -54,6 +54,7 @@ public interface FineUIStyle { String GRAY_BUTTON = "grayButton"; String DETAIL_LABEL = "detailLabel"; String WIDGET_EVENT_LABEL = "widgetEventLabel"; + String HYPER_LINK_LABEL = "hyperLinkLabel"; /** diff --git a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java index c7bfe98e22..cd0e8221c9 100644 --- a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java @@ -2,7 +2,6 @@ package com.fr.design.condition; import com.fine.theme.icon.LazyIcon; -import com.fine.theme.light.ui.FineRoundBorder; import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIUtils; import com.fr.common.annotations.Open; @@ -90,7 +89,8 @@ public abstract class ConditionAttributesPane extends BasicBeanPane { this.add(FineUIUtils.wrapComponentWithTitle(column( 10, row(cell(addItemPane), flex()), - cell(selectedItemScrollPane).weight(1).with(it -> it.setBorder(new FineRoundBorder())), + cell(selectedItemScrollPane).weight(1).with( + it -> it.setBorder(FineBorderFactory.createWrappedRoundBorder())), fix(10) ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property")), BorderLayout.NORTH); } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java index 1c05823b24..df78b837d9 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java @@ -1,10 +1,9 @@ package com.fr.design.gui.controlpane; -import com.fine.theme.light.ui.FineRoundBorder; -import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIStyle; import com.fine.theme.utils.FineUIUtils; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.border.FineBorderFactory; import com.fr.design.constants.UIConstants; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; @@ -29,7 +28,6 @@ import javax.swing.DefaultListModel; import javax.swing.JPanel; import javax.swing.ListModel; import javax.swing.ListSelectionModel; -import javax.swing.UIManager; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; @@ -102,7 +100,7 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li @Override protected void initLeftPane(JPanel leftPane) { leftPane.add(new UIScrollPane(contentPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 0)), BorderLayout.CENTER); - leftPane.setBorder(new FineRoundBorder()); + leftPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java index 2f97feeafc..7fdbad0f2a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java @@ -14,13 +14,12 @@ import java.awt.Dimension; import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.fix; -import static com.fine.swing.ui.layout.Layouts.flex; public class UINumberDragPane extends BasicBeanPane implements GlobalNameObserver { private static final long serialVersionUID = -8681716725163358249L; - private static double DRAG_BAR_WEIGHT = 0.64; - private static double SPINNER_WIGHT = 0.36; + private static double DRAG_BAR_WEIGHT = 0.6; + private static double SPINNER_WIGHT = 0.4; private UISlider dragBar; private UISpinner spinner; private boolean isEditing = false; @@ -49,7 +48,7 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam spinner.setValue(dragBar.getValue()); this.setLayout(new BorderLayout()); this.add(Layouts.row( - cell(dragBar).weight(DRAG_BAR_WEIGHT), fix(2), cell(spinner).weight(SPINNER_WIGHT) + cell(dragBar).weight(DRAG_BAR_WEIGHT), fix(8), cell(spinner).weight(SPINNER_WIGHT) ).getComponent()); dragBar.addChangeListener(e -> { if (globalNameListener != null && shouldResponseNameListener()) { diff --git a/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java b/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java index dcb9738177..b0c3f3197f 100644 --- a/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java @@ -7,6 +7,8 @@ import javax.swing.JScrollPane; import java.awt.Color; import java.awt.Component; import java.awt.Container; +import java.awt.event.ContainerAdapter; +import java.awt.event.ContainerEvent; import java.util.Arrays; /** @@ -53,6 +55,13 @@ public class ColorUtils { if (components != null) { Arrays.stream(components).forEach((e) -> syncBackgroundIfAbsent(e, replaceColor, defaultColor)); } + container.addContainerListener(new ContainerAdapter() { + @Override + public void componentAdded(ContainerEvent e) { + Component addedComponent = e.getChild(); + syncBackgroundIfAbsent(addedComponent, replaceColor, defaultColor); + } + }); } } diff --git a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java index 5e8a147a85..86c7700ed4 100644 --- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java +++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java @@ -1,11 +1,11 @@ package com.fr.design.web; -import com.fine.theme.light.ui.FineRoundBorder; import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.Icon; import com.fr.base.IconManager; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.FineJOptionPane; @@ -90,7 +90,7 @@ public class CustomIconPane extends BasicPane { UILabel iconLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel noNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - noNamePane.setBorder(new FineRoundBorder()); + noNamePane.setBorder(FineBorderFactory.createWrappedRoundBorder()); noNamePane.setBackground(Color.WHITE); iconPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties index ad0843117f..2e97c83ad2 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties @@ -1427,3 +1427,6 @@ chart.selectedBorderColor = #2576EF [style]Label.widgetEventLabel = \ foreground: $List.wrapper.text.fontColor; \ background: $fill.normal; + +[style]Label.hyperLinkLabel = \ + foreground: $brand.normal; diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java index 33a3656979..c90343468a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java @@ -2,6 +2,7 @@ package com.fr.design.report; import com.fanruan.cloud.FanruanCloud; import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.FineJOptionPane; @@ -221,7 +222,7 @@ public class ReportEnginePane extends BasicBeanPane { UILabel downExplainLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Report_Detail_Reference")); downExplainLabel.setForeground(new Color(0, 0, 0)); JLabel helper = new FRExplainLabel(Toolkit.i18nText("Fine-Design_Report_Community_Help")); - helper.setForeground(new Color(1, 159, 222)); + FineUIStyle.setStyle(helper, FineUIStyle.HYPER_LINK_LABEL); helper.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { From 2e479691f66ab8562a76dd6031b1fce13a436262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Fri, 27 Sep 2024 10:06:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-133897=20fix:TabPane=E5=9E=82?= =?UTF-8?q?=E7=9B=B4=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/frpane/FineTabbedPane.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java index 0ce50448ed..508b58ca96 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java @@ -43,7 +43,7 @@ public class FineTabbedPane extends Box { private final UIButtonGroup tabGroup; private final Map tabComponents; private final int[] tabLayout; - private final boolean useFitTab ; + private final boolean useFitTab; private FineTabbedPane(Map tabComponents, float headRatio, int[] tabLayout, boolean useFitTab) { this.headRatio = headRatio; @@ -142,35 +142,45 @@ public class FineTabbedPane extends Box { initCoreComponents(); setMatchParentSize(true); float flexRatio = (1 - headRatio) / 2; - int headHeight = FlatUIUtils.getUIInt("Component.defaultHeight",24) * tabLayout.length / 2; - Component component = useFitTab ? row(flex(), cell(tabGroup), flex()).getComponent() : row(flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio)).getComponent(); + int headHeight = FlatUIUtils.getUIInt("Component.defaultHeight", 24) * tabLayout.length / 2; + Component tabRow = useFitTab ? row(flex(), cell(tabGroup), flex()).getComponent() : row(flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio)).getComponent(); + Component backgroundComp = createBackGroundComp(); add( column( - cell(component), - flex() + cell(tabRow), + cell(centerPane).with(it -> it.setBorder(new ScaledEmptyBorder(10, 10, 10, 10))).weight(1) ), column( fix(headHeight), - cell(centerPane).with(it -> it.setBorder(new ScaledEmptyBorder(headHeight + 10, 10, 10, 10))).weight(1) + cell(backgroundComp).weight(1) ) ); fillBackgroundColor(); } + private Component createBackGroundComp() { + JPanel pane = new JPanel(); + pane.putClientProperty(PANEL_TYPE, ROUNDED_PANEL); + pane.setBackground(getFillColor()); + return pane; + } + private void initCoreComponents() { cards = new CardLayout(); centerPane = new JPanel(cards); - centerPane.putClientProperty(PANEL_TYPE, ROUNDED_PANEL); tabComponents.forEach((key, value) -> { value.setOpaque(false); centerPane.add(value, key); }); } + private Color getFillColor() { + return FineUIUtils.getUIColor("FineTabbedPane.background", "fill.gray"); + } + private void fillBackgroundColor() { - Color fillColor = FineUIUtils.getUIColor("FineTabbedPane.background", "fill.gray"); Color defaultColor = FineUIUtils.getUIColor("default.background", "Component.background"); - ColorUtils.syncBackgroundIfAbsent(centerPane, fillColor, defaultColor); + ColorUtils.syncBackgroundIfAbsent(centerPane, getFillColor(), defaultColor); } private void initListeners() {