From afdf5f7b625e533b2371cddd3949513ab39678ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 5 Sep 2024 17:06:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-133410=20fix:=20=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E8=A1=A5=E5=85=85=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/report/RichTextPane.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/RichTextPane.java b/designer-realize/src/main/java/com/fr/design/report/RichTextPane.java index 94bb7322f0..b11de3b3e0 100644 --- a/designer-realize/src/main/java/com/fr/design/report/RichTextPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/RichTextPane.java @@ -1,11 +1,13 @@ package com.fr.design.report; import com.fine.theme.utils.FineUIUtils; -import com.formdev.flatlaf.ui.FlatRoundBorder; import com.fr.base.BaseFormula; import com.fr.base.Style; +import com.fr.design.border.FineBorderFactory; import com.fr.design.cell.editor.RichTextToolBar; import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.DesignUtils; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; @@ -20,6 +22,7 @@ import com.fr.stable.Constants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; +import javax.swing.ScrollPaneConstants; import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; import javax.swing.text.DefaultStyledDocument; @@ -32,8 +35,6 @@ import java.awt.Font; import java.math.BigDecimal; import java.util.Iterator; -import static com.fine.swing.ui.layout.Layouts.cell; -import static com.fine.swing.ui.layout.Layouts.column; public class RichTextPane extends BasicPane { @@ -50,13 +51,16 @@ public class RichTextPane extends BasicPane { } protected void initComponents() { - this.setLayout(new BorderLayout()); + this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10)); textPane = new RichTextEditingPane(); - textPane.setBorder(new FlatRoundBorder()); textPane.setBackground(FineUIUtils.getUIColor("background.normal", "background")); - textPane.setFont(DEFAUL_FONT); - toolBar = new RichTextToolBar(textPane); - this.add(column(10, cell(toolBar), cell(textPane).weight(1)).getComponent()); + textPane.setFont(DEFAUL_FONT); + UIScrollPane scrollPane = new UIScrollPane(textPane, + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + toolBar = new RichTextToolBar(textPane); + this.add(toolBar, BorderLayout.NORTH); + this.add(scrollPane, BorderLayout.CENTER); } @Override From 49ace5bc968797ba7be903a188953630a63d1cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 5 Sep 2024 17:08:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-133167=20fix:=20=E5=B8=86=E8=BD=AF?= =?UTF-8?q?=E9=80=9A=E8=A1=8C=E8=AF=81=E9=9D=A2=E6=9D=BF=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E5=B0=BA=E5=AF=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../light/ui/laf/FineLightLaf.properties | 3 ++- .../fr/design/mainframe/bbs/UserInfoPane.java | 21 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) 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 d941f77eec..e9b966dcd7 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 @@ -1186,7 +1186,8 @@ South.SheetSelectedColor = #FFF #---- North ---- North.userinfoLabel.borderMargins=2, 16, 2, 16 -North.userinfoLabel.width=80 +North.userinfoLabel.maxWidth=176 +North.userinfoLabel.minWidth=80 North.userinfoLabel.height=24 North.border = $defaultBorderColor North.messageLabel.foreground=$text.placeholder diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java index 088a9ec79d..0ca64e4656 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java @@ -3,7 +3,6 @@ */ package com.fr.design.mainframe.bbs; -import com.fine.theme.utils.FineUIScale; import com.fr.base.FRContext; import com.fr.concurrent.NamedThreadFactory; import com.fr.design.DesignerEnvManager; @@ -29,6 +28,8 @@ import java.util.Date; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import static com.fine.theme.utils.FineUIScale.scale; + /** * @author neil @@ -63,12 +64,11 @@ public class UserInfoPane extends BasicPane { * 构造函数 */ private UserInfoPane() { - this.setPreferredSize(FineUIScale.scale(new Dimension(UIManager.getInt("North.userinfoLabel.width"), UIManager.getInt("North.userinfoLabel.height")))); this.setLayout(new BorderLayout()); this.userInfoLabel = new UserInfoLabel(this); Insets insets = UIManager.getInsets("North.userinfoLabel.borderMargins"); - Insets scaledInsets = FineUIScale.scale(insets); + Insets scaledInsets = scale(insets); this.userInfoLabel.setBorder(BorderFactory.createEmptyBorder(scaledInsets.top, scaledInsets.left, scaledInsets.bottom, scaledInsets.right)); this.markUnSignIn(); @@ -105,6 +105,7 @@ public class UserInfoPane extends BasicPane { public void markUnSignIn() { this.userInfoLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Login_Onclick")); this.userInfoLabel.resetUserName(); + fitSize(); } /** @@ -115,6 +116,18 @@ public class UserInfoPane extends BasicPane { public void markSignIn(String userName) { this.userInfoLabel.setText(userName); this.userInfoLabel.setUserName(userName); + fitSize(); + } + + private void fitSize() { + int height = UIManager.getInt("North.userinfoLabel.height"); + int maxWidth = UIManager.getInt("North.userinfoLabel.maxWidth"); + int minWidth = UIManager.getInt("North.userinfoLabel.minWidth"); + int labelWidth = userInfoLabel.getPreferredSize().width; + // 自适应尺寸，并限制最大最小尺寸 + int preferWidth = Math.min(Math.max(minWidth, labelWidth), maxWidth); + Dimension fitDimension = scale(new Dimension(preferWidth, height)); + setPreferredSize(fitDimension); } @Override @@ -199,6 +212,4 @@ public class UserInfoPane extends BasicPane { }); executorService.shutdown(); } - - } From 6e4dfcd68541d2fdcee4c470d7f1de8570e4af6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 5 Sep 2024 17:10:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-132391=20fix:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=9D=A2=E6=9D=BF=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/update/ui/dialog/UpdateMainDialog.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java index 282b09d7fa..5886a53234 100644 --- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java @@ -1,7 +1,6 @@ package com.fr.design.update.ui.dialog; import com.fanruan.product.ProductConstants; -import com.fine.theme.utils.FineUIScale; import com.fr.decision.update.data.UpdateConstants; import com.fr.decision.update.info.UpdateCallBack; import com.fr.decision.update.info.UpdateProgressCallBack; @@ -14,7 +13,6 @@ import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -62,6 +60,7 @@ import java.util.*; import java.util.List; import java.util.concurrent.ExecutionException; +import static com.fine.theme.utils.FineUIScale.scale; import static java.nio.charset.StandardCharsets.*; import static javax.swing.JOptionPane.QUESTION_MESSAGE; @@ -72,11 +71,10 @@ public class UpdateMainDialog extends UIDialog { public static final Dimension DEFAULT = new Dimension(660, 620); private static final Dimension PROGRESSBAR = new Dimension(120, 15); - private static final Dimension UPDATE_BUTTON = new Dimension(80, 24); private static final int UPDATE_PANE_ROW_SIZE = 30; private static final int UPDATE_CONTENT_PANE_ROW_SIZE = 10; private static final int UPDATE_CONTENT_PANE_COLUMN_SIZE = 10; - private static final int UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE = 100; + private static final int UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE = 120; private static final int SEARCH_PANE_ROW_SIZE = 50; private static final int SEARCH_PANE_TEXT_COLUMN = 130; private static final int SEARCH_PANE_COLUMN_GAP = 3; @@ -159,7 +157,7 @@ public class UpdateMainDialog extends UIDialog { progressBar.setForeground(UpdateConstants.BAR_COLOR); progressBar.setVisible(false); progressBar.setStringPainted(true); - progressBar.setPreferredSize(PROGRESSBAR); + progressBar.setPreferredSize(scale(PROGRESSBAR)); progressBarPane.add(GUICoreUtils.createBorderLayoutPane( progressBar, BorderLayout.CENTER @@ -298,7 +296,6 @@ public class UpdateMainDialog extends UIDialog { loadingLabel = new LoadingLabel(); loadingLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Checking_Jar_Update")); updateButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Update")); - updateButton.setPreferredSize(FineUIScale.scale(UPDATE_BUTTON)); updateButton.setEnabled(false); double[] rowSize = {TableLayout.PREFERRED}; @@ -692,7 +689,7 @@ public class UpdateMainDialog extends UIDialog { * 显示窗口 */ public void showDialog() { - setSize(DEFAULT); + setSize(scale(DEFAULT)); setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade")); GUICoreUtils.centerWindow(this); setVisible(true); From e6b2ec21a3720b688fd1dc89e74b08a7edd9da3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 5 Sep 2024 17:11:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-133112=20fix:=20=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E5=88=B7=E6=96=B0=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/WidgetPropertyPane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index aa6f5f6642..36b8fa138d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -114,6 +114,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper this.createTabPane(); this.initTables(); + revalidate(); } /** From 47c9963e06a31917647aa46101e6609022408fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 5 Sep 2024 17:13:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A0jira=20=E8=B6=85=E9=93=BE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChartHyperPopAttrPane.java | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java index ac30dbf3be..b6a4993c44 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java @@ -1,5 +1,8 @@ package com.fr.design.chart.series.SeriesCondition.impl; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Parameter; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.web.ChartHyperPoplink; @@ -9,18 +12,13 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.AbstractChartAttrPane; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.ParameterProvider; import javax.swing.JPanel; -import javax.swing.SwingConstants; import java.util.List; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; /** * 图表弹出超链, 悬浮窗属性设置界面. @@ -52,41 +50,31 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { @Override protected JPanel createContentPane() { JPanel pane = new JPanel(); - pane.setLayout(FRGUIPaneFactory.createBorderLayout()); - + pane.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10)); + pane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); titleField = new UITextField(15); - titleField.setPreferredSize(new Dimension(200, 20)); - + widthField = new UINumberField(4); widthField.setColumns(10); - widthField.setPreferredSize(new Dimension(200, 20)); - + heightField = new UINumberField(4); heightField.setColumns(10); - heightField.setPreferredSize(new Dimension(200, 20)); - - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - - double[] columnSize = { p,f}; - double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":", SwingConstants.RIGHT), widthField}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":", SwingConstants.RIGHT), heightField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":"), titleField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":"), widthField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":"), heightField}, }; widthField.setText(String.valueOf(DEFAULT_V_VALUE)); heightField.setText(String.valueOf(DEFAULT_H_VALUE)); - JPanel northPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); + JPanel northPane = FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); pane.add(northPane, BorderLayout.NORTH); parameterViewPane = new ReportletParameterViewPane(paraType, valueEditorPane, valueRenderPane); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))); - parameterViewPane.setPreferredSize(new Dimension(200, 200)); - pane.add(parameterViewPane, BorderLayout.CENTER); + pane.add(FineUIUtils.wrapComponentWithTitle(parameterViewPane, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")), BorderLayout.CENTER); return pane; }