From e9b1ad1f909bd10c0b09588f48674ff2ca4f696d Mon Sep 17 00:00:00 2001 From: Starryi Date: Mon, 12 Apr 2021 14:40:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-50809=20frm=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=B8=8Ecpt=E6=A8=A1=E7=89=88=E5=9C=A8=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=86=85=E9=A2=84=E8=A7=88=E5=9B=BE=E6=A0=87=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 CPT和FRM文件的预览按钮图标使用了不同的图片。 PagePreview类规定了CPT的分页预览图标为com/fr/design/images/buttonicon/pageb24.png，而 FormPreview类规定了FRM的预览图标为com/fr/design/images/buttonicon/run24.png. 这两个图片大小都为32x32，且图形内容大致相同，但是pageb24图形周围存在透明像素， 所以可见的图形大小小于run24.png 【改动思路】 将run24.png的内容替换为pageb24.png --- .../com/fr/design/images/buttonicon/run24.png | Bin 942 -> 736 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/run24.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/run24.png index 8ebe92439eba1ae9355d11b8cc1477dcd782cd0f..67127219d8ecf3cdab46e61f8afbbfbbc3819008 100644 GIT binary patch delta 700 zcmV;t0z>_-2jB&eFn8j4^ynE-KbKZS-h6il+hoLoK=m9U$;*G?D7c5k*mVZV_n^CJ~Al?jef#kEYB8Wm8hw_5FFYLHxzSeJp(v#r?1QRkK9 zl5sjO;k0i>UVm$W4L<@c@p4XA2Q+sh3NRHGQM7Ca7~}iVWq`H|b7ltC^f>nK>VW;A z4L_sfn3&BX(R~6%u8USejp;H_Jp;jD5czx_Znt-hbhy8Q{eC}sdi!wm`{A{m1~S~U zR4RpJGFcLLQ)xXO559c*2u9$k`RX8bw6!iI-M?Po)_;{V)jW#zN}+%o58q+2_oN(e z+J$5*laoo+K&#mdt}w5bR>Td@fX~Ol(WQNIf+&Gybx}i`N#XVHLXv7<7e!G-PO?y{ z*N1f3B>w|k#swzu87|kc^=zw=z}xpo^&D5tlL^Be$hX_@>ccn0W~N9U8UF}>#cXT} zTy|QHX@3F32Fhgf_H(%RW)d$)1DK3P!1H-bM8bIbYy=}?VO;i}LSN!JI^(akv@1Eo zpP_5}gGs;JjE}b{u zw!0!;&PNYiM`)=715O9L{Q_8iNl`{FbPXX{pfw9K3=%dkuHJnNOJ*8^^N4EM#u!+Y io3o!+75<<2*MUF3y2bkI9sFndyEFL%yQxSa?|1^5g7IhPYb_%n$oE|N^+n@jkBoBy>6h!byM#R@bW zBXB6mH=P4hG=FNk+#9((UVUTsNadSRu>wkW0Gfi@VF6TX&_TMjt2a^<1;~*R)^UW6 zJw~AAEeMSk4Eu4r-B^vz$8ySPP@xHOO9ggC0iJrGqoV_@y{#xOFGq24C3HIW&e<_H zHwTl+g!cAYR8&+TbbqO04=4%{$YnuqZ!bDKJJHzKh=17FSb^JMFsz9xDk?%lLj#N_ zgIRx}AVv%n1@L=7MLD4FYr(nm)vyuj;5I!3M{qQs*Qe>XJfEpN^HiHV_8c}|D zRRMQo28KsQ`?$%%0|!%{?6A@oXsBc=!w!yhp@@>$5@0WDhQ@n*n;)p(-^@0Q6c z0SplWTiO{sY`G2F($6gx(ag2FibwbFfZ3A_T7MfU@(Q6>0=T6PvJ~?=BW~7Tz~HMs zFpTgZ#Z~7<{YAK3Zj|IEB7W%V`d%T-yNM)!N_ToR)3SR&_-Gr{zh)2>pUmzDfiTZZ zzzq$Sla3>Fx*Nv4biC+)j&MDR@q=|>h+v41W{PjYrc}|y8I=R>t6rJI(#i}}38%xP&BFUtfbI|FVe1%U?ptYSuu97~s_B!4X}snVgHGgQ75* zU4u_k7U-jNC@V}y#QP=*h1WeGVc5n%g(bjJP>Z%F-LTu2p|OriqIXpQmyOm&z+89* iPiJGXkW(!Y@EaMR2b1K<1?T_(002ovP6b4+LSTZpQ=#kt From fb1534f3eaf83f757770648cbde845c75d78e9fe Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Tue, 13 Apr 2021 16:27:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?CHART-18881=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=9C=89=E6=97=B6=E5=80=99=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=82=B9=E5=87=BA=E5=9B=BE=E8=A1=A8=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/ChartPropertyPane.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java index 190f43864f..c5c2a3fe4d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java @@ -24,15 +24,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane { * 创建图表属性表实例. */ private synchronized static ChartPropertyPane getInstance() { - //创建新图表时，创建属性表配置面板 - if (singleton == null) { - singleton = new ChartPropertyPane(); - } - return singleton; + return new ChartPropertyPane(); } - private static ChartPropertyPane singleton; - protected TargetComponentContainer container = new TargetComponentContainer(); protected ChartEditPane chartEditPane; @@ -160,8 +154,4 @@ public class ChartPropertyPane extends BaseChartPropertyPane { chartEditPane.setSupportCellData(supportCellData); } } - - public synchronized static void clear() { - singleton = null; - } } \ No newline at end of file From 5f0d39ecb9c8560aa879639088ba682a655c0ef6 Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 13 Apr 2021 17:16:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-49686=20=E5=86=B3=E7=AD=96=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83=E5=B1=80=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E8=B0=83=E6=95=B4=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E7=94=BB=E5=B8=83=E5=9D=97=E7=9A=84=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?= =?UTF-8?q?=E8=BF=99=E9=87=8C=E7=BB=9D=E5=AF=B9=E7=94=BB=E5=B8=83=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4=E8=A6=81=E5=88=86?= =?UTF-8?q?=E4=B8=BA=E4=B8=A4=E7=A7=8D=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E7=A7=8D=E6=98=AF=E6=8B=96=E6=8B=BD=E6=94=B9=E5=8F=98=EF=BC=8C?= =?UTF-8?q?=E5=8F=A6=E4=B8=80=E7=A7=8D=E6=98=AF=E5=9C=A8=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E4=B8=AD=E6=94=B9=E5=8F=98=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E6=95=B0=E5=80=BC=EF=BC=8C=E9=97=AE=E9=A2=98=E7=9A=84=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E6=98=AF=E6=AD=A4=E5=89=8DREPORT-7588=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E6=8B=96=E6=8B=BD=E6=97=B6=E4=BC=9A=E8=B5=B0=E5=88=B0?= =?UTF-8?q?FormSelection#fixCreator()=EF=BC=8C=E8=BF=99=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=BA=E7=BB=9D=E5=AF=B9=E7=94=BB=E5=B8=83=E5=9D=97=E5=81=9A?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86=E6=97=B6=EF=BC=8C=E6=BC=8F?= =?UTF-8?q?=E7=AE=97=E4=BA=86=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E7=9A=84?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=EF=BC=8C=E7=84=B6=E5=90=8E=E5=9C=A8REPORT-34?= =?UTF-8?q?739=E4=B8=AD=EF=BC=8CFRFitLayoutAdapter#fix()=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=B8=AD=E5=A4=84=E7=90=86=E4=BA=86=E4=B8=80=E4=B8=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=9D=A2=E6=9D=BF=E9=80=A0=E6=88=90=E7=9A=84=E5=81=8F?= =?UTF-8?q?=E7=A7=BB=EF=BC=8C=E6=89=80=E4=BB=A5=E6=8B=96=E6=8B=BD=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=83=BD=E6=AD=A3=E5=B8=B8=EF=BC=9B=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E5=A6=82=E6=9E=9C=E5=9C=A8=E5=8F=B3=E4=BE=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E6=94=B9=E5=8F=98=E9=AB=98=E5=BA=A6=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E7=9B=B4=E6=8E=A5=E8=B5=B0=E5=88=B0FRFitLayo?= =?UTF-8?q?utAdapter#fix()=E4=B8=AD=EF=BC=8C=E6=AD=A4=E6=97=B6=E6=98=AF?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=BC=8F=E7=AE=97=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=AB=98=E5=BA=A6=E7=9A=84=EF=BC=8C=E5=9B=A0=E6=AD=A4?= =?UTF-8?q?=E7=BB=8F=E8=BF=87=E5=A4=84=E7=90=86=E4=B9=8B=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=8F=8D=E8=80=8C=E7=BB=84=E4=BB=B6=E7=9A=84backupBound?= =?UTF-8?q?=E4=BC=9A=E5=A4=9A=E4=BA=86=E4=B8=AA=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=AB=98=E5=BA=A6=EF=BC=8C=E8=BF=99=E6=A0=B7=E4=BC=9A?= =?UTF-8?q?=E9=80=A0=E6=88=90=E6=AF=8F=E6=AC=A1=E6=94=B9=E5=8F=98=E9=83=BD?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E8=BF=99=E4=B8=AA=E9=AB=98=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E5=87=BA=E7=8E=B0=E4=BA=86bug=E7=8E=B0=E8=B1=A1=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E6=8A=8A?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=BC=8F=E7=AE=97=E7=9A=84=E9=80=BB=E8=BE=91=E6=94=BE?= =?UTF-8?q?=E5=88=B0FormSelection#fixCreator()=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/layout/FRFitLayoutAdapter.java | 10 +--------- .../com/fr/design/mainframe/FormSelection.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java index c0eb392979..22d74d7741 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java @@ -347,15 +347,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter { //拖拽组件原大小、位置 Rectangle backupBound = creator.getBackupBound(); backupBound.x -= container.getX(); - // REPORT-34739 对绝对画布块的backupBound.y的调整还需要考虑一下参数面板块的高度造成的偏移 - int paraHeight = 0; - if (creator.acceptType(XWAbsoluteLayout.class)) { - JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - if (jTemplate instanceof JForm) { - paraHeight = ((JForm) jTemplate).getFormDesign().getParaHeight(); - } - } - backupBound.y -= (container.getY() - paraHeight); + backupBound.y -= container.getY(); //当前拖拽组件的位置 int x = creator.getX(); int y = creator.getY(); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java index cbebbcba16..97228209a1 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java @@ -12,6 +12,7 @@ import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; +import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.utils.ComponentUtils; import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.Widget; @@ -270,7 +271,9 @@ public class FormSelection { LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(designer, creator); if (layoutAdapter != null) { if (creator.acceptType(XWAbsoluteLayout.class) && recs.size() > i) { - creator.setBackupBound(recs.get(i)); + Rectangle rectangle = recs.get(i); + check4ParaPane(rectangle); + creator.setBackupBound(rectangle); } else { creator.setBackupBound(backupBounds); } @@ -280,6 +283,19 @@ public class FormSelection { } } + /** + * 检查下有没有参数面板，如果存在，处理下参数面板造成的偏移量 + * @param rectangle + */ + private void check4ParaPane(Rectangle rectangle) { + int paraHeight = 0; + JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + if (jTemplate instanceof JForm) { + paraHeight = ((JForm) jTemplate).getFormDesign().getParaHeight(); + } + rectangle.y += paraHeight; + } + private void removeCreatorFromContainer(XCreator creator) { XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(creator); if (parent == null) { From fc048bdce871cea88f79b38a19d853df6ceffbc8 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Wed, 14 Apr 2021 10:42:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?KERNEL-7376=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E4=B8=8A=E4=B8=80=E4=BA=9B=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/file/HistoryTemplateListCache.java | 2 -- .../java/com/fr/design/module/DesignModuleFactory.java | 8 -------- 2 files changed, 10 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java index f6b8f07d52..8742a894f2 100644 --- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java +++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java @@ -64,7 +64,6 @@ public class HistoryTemplateListCache implements CallbackEvent { * @param selected 选择的 */ public void closeSelectedReport(JTemplate selected) { - DesignModuleFactory.clearChartPropertyPane(); DesignTableDataManager.closeTemplate(selected); //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑 if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) { @@ -92,7 +91,6 @@ public class HistoryTemplateListCache implements CallbackEvent { * @param selected 选择的 */ public void closeVirtualSelectedReport(JTemplate selected) { - DesignModuleFactory.clearChartPropertyPane(); DesignTableDataManager.closeTemplate(selected); if (contains(selected) == -1) { return; diff --git a/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java b/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java index f3e8c4ebd2..5ff882f642 100644 --- a/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java +++ b/designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java @@ -243,14 +243,6 @@ public class DesignModuleFactory { return bp; } - - public static void clearChartPropertyPane() { - if (instance.chartPropertyPaneClass != null) { - StableUtils.clearInstance(instance.chartPropertyPaneClass); - } - } - - public static void registerButtonDetailPaneClass(Class clazz) { instance.buttonDetailPaneClass = clazz; }