From 10528297b3994addaacd94ff1ea9cf1fd822c759 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 16 Feb 2022 14:58:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-66808=20=20&&=20REPORT-66811=20?= =?UTF-8?q?=E3=80=90=E6=96=B0=E8=80=81=E8=87=AA=E9=80=82=E5=BA=94=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=9D=A2=E6=9D=BF=E4=BF=AE=E6=94=B9=E3=80=91=E8=80=81?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F-PC=E7=AB=AF=E8=87=AA=E9=80=82=E5=BA=94?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E2=80=9C=E6=8A=A5=E8=A1=A8=E2=80=9D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=BB=98=E8=AE=A4=E6=97=B6=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=9D=97=E5=8F=B3=E4=BE=A7=E8=AE=BE=E7=BD=AE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=A2=84=E6=9C=9F=E6=98=AF=E6=9C=89=E4=B8=AA=E2=80=9C?= =?UTF-8?q?=E5=B7=B2=E9=80=89=E6=8B=A9=E9=BB=98=E8=AE=A4balabala=E2=80=9D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E7=9A=84=EF=BC=8C=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E4=B9=88=E6=9C=89=EF=BC=9B=E3=80=90=E6=96=B0=E8=80=81?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91=E8=80=81=E6=A8=A1=E5=BC=8F-?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=96=87=E6=A1=A3=E9=87=8C=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=9A=84=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E2=80=9C=E6=8A=A5=E8=A1=A8=E7=BC=A9=E6=94=BE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E2=80=9D=E5=8F=AF=E9=80=89=E2=80=9C=E5=8F=8C=E5=90=91=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94=E2=80=9D=E2=80=9C=E4=B8=8D=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E2=80=9D=EF=BC=8C=E7=8E=B0=E5=9C=A8=E7=9A=84=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E6=98=AF=E2=80=9C=E5=9B=BA=E5=AE=9A=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E2=80=9D=E2=80=9C=E9=80=82=E5=BA=94=E5=8C=BA=E5=9F=9F=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/report/fit/FormFitAttrModelType.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/report/fit/FormFitAttrModelType.java b/designer-base/src/main/java/com/fr/design/report/fit/FormFitAttrModelType.java index 658eece8e..c43aa057d 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/FormFitAttrModelType.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/FormFitAttrModelType.java @@ -27,8 +27,8 @@ public enum FormFitAttrModelType { @Override public Item[] getAbsoluteLayoutSaleAttr() { return new Item[]{ - new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT), - new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WAbsoluteLayout.STATE_FIT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-No"), WAbsoluteLayout.STATE_FIXED) }; } From 01a40a1e7bbde69f71e6252e821fda3e54058f68 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 16 Feb 2022 14:59:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/ElementEditorDefinePane.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java index 3eb947488..8f1e1c994 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java @@ -7,22 +7,28 @@ import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.creator.*; import com.fr.design.fit.common.TemplateTool; import com.fr.design.fit.attrpane.PcFitExpandablePane; +import com.fr.design.gui.ilable.UIAutoChangeLineLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.style.FollowingThemePane; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.accessibles.AccessibleElementCaseToolBarEditor; import com.fr.design.widget.ui.designer.component.PaddingBoundPane; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.PaddingMargin; import com.fr.form.web.FormToolBarManager; import com.fr.general.ComparatorUtils; +import com.fr.report.fit.FitProvider; import com.fr.report.fit.ReportFitAttr; +import com.fr.report.fit.ReportFitConfig; import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.util.ArrayList; import java.util.List; @@ -78,11 +84,23 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane Date: Wed, 16 Feb 2022 18:37:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-66254=20=E3=80=90=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E9=A3=8E=E6=A0=BC=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=95=86=E5=9F=8E=E7=AA=97=E5=8F=A3=E5=88=B0?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E6=9C=9F=E9=97=B4=E5=A4=A7=E6=A6=82=E6=9C=89?= =?UTF-8?q?5=E7=A7=92=E7=A9=BA=E7=99=BD=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 1. 网络加载时间比较长，从而出现空白画面 2. 前端资源JS中存在相对地址的fetch请求，因而无法将JS缓存到本地使用 为了缓存空白问题，关闭商城窗口时重新加载数据，清除页面状态，同时不清除 窗口内存资源。从而再下次打开时，可以直接展示该窗口对象，提高展示效率。 【改动思路】 同上 --- .../share/ui/online/mini/MiniComponentShopDialog.java | 3 +-- .../share/ui/online/mini/MiniComponentShopPane.java | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopDialog.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopDialog.java index 817adfa34..ab17b0de3 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopDialog.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopDialog.java @@ -67,8 +67,7 @@ public class MiniComponentShopDialog { for (WindowListener listener: windowListeners) { listener.windowClosed(e); } - getInstance().frame = null; - shopPane.dispose(); + shopPane.reload(); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopPane.java index 9b980f14b..f9d3849f7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/MiniComponentShopPane.java @@ -59,13 +59,13 @@ public class MiniComponentShopPane extends JPanel { loginListener = new Listener() { @Override public void on(Event event, String param) { - modernUIPane.redirect(OnlineShopUtils.getWebMiniShopPath()); + reload(); } }; logoutListener = new Listener() { @Override public void on(Event event, String param) { - modernUIPane.redirect(OnlineShopUtils.getWebMiniShopPath()); + reload(); } }; @@ -78,4 +78,8 @@ public class MiniComponentShopPane extends JPanel { EventDispatcher.stopListen(loginListener); EventDispatcher.stopListen(logoutListener); } + + public void reload() { + modernUIPane.redirect(OnlineShopUtils.getWebMiniShopPath()); + } }