From cfa4526090689d1cdcdffd14fb567a80237f7833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Fri, 21 Jan 2022 15:45:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-63660=20frm=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=88=87=E6=8D=A2-=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesktopCardPane.java | 4 +- .../LoadingUtils.java} | 42 +++++++----------- .../{openloading.png => loading.png} | Bin 3 files changed, 20 insertions(+), 26 deletions(-) rename designer-base/src/main/java/com/fr/design/{mainframe/OpenLoadingPane.java => utils/LoadingUtils.java} (78%) rename designer-base/src/main/resources/com/fr/design/images/mainframe/{openloading.png => loading.png} (100%) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java index a2c6efcb2..74dc18075 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java @@ -10,9 +10,11 @@ import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.dialog.BasicPane; import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedListener; +import com.fr.design.utils.LoadingUtils; import javax.swing.JComponent; import javax.swing.JLayeredPane; +import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; @@ -31,7 +33,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener private static final long serialVersionUID = 1L; private JTemplate component; private TransparentPane transparentPane = new TransparentPane(); - private OpenLoadingPane loadingPane = new OpenLoadingPane(); + private JPanel loadingPane = LoadingUtils.createLoadingPane(); private OpenFailedPane failedPane = new OpenFailedPane(); private JLayeredPane layeredPane = new JLayeredPane() { @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java b/designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java similarity index 78% rename from designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java rename to designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java index adc30b2bf..433df931a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java +++ b/designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java @@ -1,35 +1,29 @@ -package com.fr.design.mainframe; +package com.fr.design.utils; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.general.IOUtils; + +import javax.swing.ImageIcon; +import javax.swing.JPanel; import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; import java.awt.LayoutManager; -import javax.swing.ImageIcon; -import javax.swing.JPanel; - -/** - * @author hades - * @version 10.0 - * Created by hades on 2021/4/9 - */ -public class OpenLoadingPane extends JPanel { - private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/openloading.png")); +public class LoadingUtils { + private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.png")); private static final Color TIP_COLOR = new Color(108, 174, 235); private static final int Y_GAP = 50; private static final int X_GAP = 10; - private UILabel loadingLabel; - private UILabel tipLabel; - - public OpenLoadingPane() { - - setLayout(new LayoutManager() { - + public static JPanel createLoadingPane() { + JPanel jPanel = new JPanel(); + UILabel loadingLabel = new UILabel(LOADING_ICON); + UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading")); + tipLabel.setForeground(TIP_COLOR); + jPanel.setLayout(new LayoutManager() { @Override public void removeLayoutComponent(Component comp) { } @@ -64,12 +58,10 @@ public class OpenLoadingPane extends JPanel { public void addLayoutComponent(String name, Component comp) { } }); - setBackground(Color.WHITE); - loadingLabel = new UILabel(LOADING_ICON); - tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading")); - tipLabel.setForeground(TIP_COLOR); - add(loadingLabel); - add(tipLabel); + jPanel.setBackground(Color.WHITE); + jPanel.add(loadingLabel); + jPanel.add(tipLabel); + return jPanel; } -} +} \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/loading.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/loading.png From c7f6d6a791d61b35c6c78605809e2bd9bece542a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Fri, 21 Jan 2022 16:44:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-66011=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=96=87=E5=AD=97=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index dc6b0490f..26340c1e2 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -834,7 +834,7 @@ public class CellDSColumnEditor extends CellQuickEditor { //显示set和tip setCardPane.setPreferredSize(new Dimension(156, 20)); TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); - tipCardPane.setPreferredSize(new Dimension(224, 40)); + tipCardPane.setPreferredSize(new Dimension(224, 50)); TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); } else { //未定义 @@ -958,7 +958,7 @@ public class CellDSColumnEditor extends CellQuickEditor { //显示set和tip setCardPane.setPreferredSize(new Dimension(156, 20)); TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP); - tipCardPane.setPreferredSize(new Dimension(224, 40)); + tipCardPane.setPreferredSize(new Dimension(224, 50)); TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER); break; case EVEN: From b86d00b5ca2e97d966873be2884b967f1f7b8112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Fri, 21 Jan 2022 18:26:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-65920=20=E3=80=9011.0=E3=80=91mac?= =?UTF-8?q?=E7=94=B5=E8=84=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=EF=BC=8Ctab-=E7=A7=BB=E5=8A=A8=E7=AB=AF-=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=A1=86=E5=81=B6?= =?UTF-8?q?=E5=8F=91=E6=80=A7=E7=9A=84=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E4=B8=80=E4=B8=AA=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/style/AbstractPopBox.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java b/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java index 4df9b7514..167cc163e 100644 --- a/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java +++ b/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java @@ -134,6 +134,7 @@ public abstract class AbstractPopBox extends JPanel { Window parentWindow = SwingUtilities.windowForComponent(this); if (parentWindow != null) { this.selectPopupWindow = new SelectControlWindow(parentWindow); + this.selectPopupWindow.setAlwaysOnTop(true); } selectPopupWindow.addMouseListener(new MouseAdapter() { From fc3bc8306424abfbbe17c3990fabad9d4fe0d61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 25 Jan 2022 21:02:33 +0800 Subject: [PATCH 4/5] REPORT-65920 --- .../src/main/java/com/fr/design/style/AbstractPopBox.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java b/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java index 167cc163e..4df9b7514 100644 --- a/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java +++ b/designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java @@ -134,7 +134,6 @@ public abstract class AbstractPopBox extends JPanel { Window parentWindow = SwingUtilities.windowForComponent(this); if (parentWindow != null) { this.selectPopupWindow = new SelectControlWindow(parentWindow); - this.selectPopupWindow.setAlwaysOnTop(true); } selectPopupWindow.addMouseListener(new MouseAdapter() { From 1226303d70ed029d9695c7bff82dba52fb8d13ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Wed, 26 Jan 2022 10:17:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-63660=20=E4=BF=AE=E6=AD=A3=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E7=90=86=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/utils/LoadingUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java b/designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java index 433df931a..e14f3f101 100644 --- a/designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java @@ -21,7 +21,7 @@ public class LoadingUtils { public static JPanel createLoadingPane() { JPanel jPanel = new JPanel(); UILabel loadingLabel = new UILabel(LOADING_ICON); - UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading")); + UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Loading")); tipLabel.setForeground(TIP_COLOR); jPanel.setLayout(new LayoutManager() { @Override