From 8414fc8773230d1f5ff11799d7f1f2fba86c4cdf Mon Sep 17 00:00:00 2001 From: Bryant Date: Fri, 1 Nov 2019 08:50:12 +0800 Subject: [PATCH 01/13] =?UTF-8?q?REPORT-23486=20=E4=BF=AE=E5=A4=8Dbug?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/update/actions/RecoverForDesigner.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java b/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java index 7cb2826cf..eb25ccea3 100644 --- a/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java +++ b/designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java @@ -85,12 +85,12 @@ public class RecoverForDesigner implements Recover { private void backupFilesFromInstallLib(String installHome, String todayBackupDir) { try { CommonUtils.mkdirs(new File(StableUtils.pathJoin(todayBackupDir,UpdateConstants.DESIGNERBACKUPPATH))); - File file = new File(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME)); - File[] files = file.listFiles(); + File lib = new File(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME)); + File[] files = lib.listFiles(); File dir = new File(StableUtils.pathJoin(todayBackupDir,UpdateConstants.DESIGNERBACKUPPATH)); if (files != null) { - for (File file1 : files) { - if (file1.getName().startsWith(UpdateConstants.FINE) || file1.getName().contains(UpdateConstants.ASPECTJRT)) { + for (File file : files) { + if (file.getName().startsWith(UpdateConstants.FINE) || file.getName().contains(UpdateConstants.ASPECTJRT)) { CommonIOUtils.copy(file, dir); } } From 8208831c2c47974efb6da1e588d9c3cf7a218e16 Mon Sep 17 00:00:00 2001 From: "Hugh.C" Date: Fri, 1 Nov 2019 12:50:44 +0800 Subject: [PATCH 02/13] =?UTF-8?q?REPORT-23570=20=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=EF=BC=8Cgc=E4=B8=BA?= =?UTF-8?q?=E8=B4=9F=E6=95=B0=E6=97=B6=E5=BA=94=E5=BD=93=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E2=80=9C=E6=97=A0=E5=8F=AF=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/file/PreferencePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 43d739177..4a1c208c9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -883,7 +883,7 @@ public class PreferencePane extends BasicPane { } catch (InterruptedException e) { FineLoggerFactory.getLogger().error(e, e.getMessage()); } - updateGcDialogPanelInfo(i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size)); + updateGcDialogPanelInfo(size <= 0 ? i18nText("Fine-Design_Vcs_No_Optimizable_File") : i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size)); gcDialogDownPane.revalidate(); gcDialogDownPane.repaint(); gcDialogDownPane.add(gcOkButton); From 586bbabb586589b698190c2b47966c828d500693 Mon Sep 17 00:00:00 2001 From: Hades Date: Fri, 1 Nov 2019 15:15:10 +0800 Subject: [PATCH 03/13] =?UTF-8?q?REPORT-23578=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=96=87=E4=BB=B6-=E9=80=89=E9=A1=B9-=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E9=87=8C=E6=96=B0=E5=8A=A0=E4=BA=86=E4=B8=AA=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E6=9C=89=E5=BE=88=E5=A4=9Abug=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/file/PreferencePane.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 4a1c208c9..e982d04cd 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -199,10 +199,11 @@ public class PreferencePane extends BasicPane { upmSelectorPane.add(useOptimizedUPMCheckbox); advancePane.add(upmSelectorPane); - JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager")); - useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager")); - dbmSelectorPane.add(useUniverseDBMCheckbox); - advancePane.add(dbmSelectorPane); + //REPORT-23578 先屏蔽掉 + //JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager")); + //useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager")); + //dbmSelectorPane.add(useUniverseDBMCheckbox); + //advancePane.add(dbmSelectorPane); JPanel improvePane = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Product_Improve")); joinProductImproveCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Join_Product_Improve")); @@ -704,7 +705,7 @@ public class PreferencePane extends BasicPane { useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM()); - useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM()); + //useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM()); this.oracleSpace.setSelected(designerEnvManager.isOracleSystemSpace()); this.cachingTemplateSpinner.setValue(designerEnvManager.getCachingTemplateLimit()); @@ -817,7 +818,7 @@ public class PreferencePane extends BasicPane { @Override public void run() { ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected()); - ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected()); + //ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected()); } @Override From c7d1e23a32efdf6ea13727b7bf8b0b29a7213bd7 Mon Sep 17 00:00:00 2001 From: Bryant Date: Mon, 4 Nov 2019 14:55:56 +0800 Subject: [PATCH 04/13] =?UTF-8?q?REPORT-23486=20=E4=BF=AE=E5=A4=8Dbug?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/update/ui/dialog/RestoreResultDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java index d94a93c71..7522041ff 100644 --- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java @@ -219,7 +219,7 @@ public class RestoreResultDialog extends JDialog { files = installEnv.listFiles(); if (files != null) { for (File file : files) { - if (file.getName().startsWith(UpdateConstants.FINE) || file.getName().equals(UpdateConstants.ASPECTJRT)) { + if (file.getName().startsWith(UpdateConstants.FINE) || file.getName().contains(UpdateConstants.ASPECTJRT)) { list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName())); } } From ce109401409f58408962371e4f7e9cc85003dfcf Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 4 Nov 2019 16:42:05 +0800 Subject: [PATCH 05/13] =?UTF-8?q?REPORT-22806=09=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E4=B8=8B=E5=9D=97=E8=BF=98=E6=98=AF?= =?UTF-8?q?=E6=9C=89=E5=8F=A0=E7=9B=96=20=E8=BD=AC=E4=B8=93=E4=BA=BA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1-Winnie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/FRAbsoluteLayoutAdapter.java | 9 +++---- .../adapters/layout/FRBodyLayoutAdapter.java | 24 +++++++++---------- .../adapters/layout/FRFitLayoutAdapter.java | 5 ++-- .../layout/FRTabFitLayoutAdapter.java | 5 ++-- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java index 8973f1d20..4e6adee4b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java @@ -38,7 +38,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter { public HoverPainter getPainter() { return painter; } - + /** * 是否能在指定位置添加组件 * @param creator 组件 @@ -240,7 +240,8 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter { updateCreatorBackBound(); LayoutUtils.layoutRootContainer(container); }else{ - fixAbsolute(creator, x, y); + //添加到其父组件布局中的时候，要用其父组件布局添加 + container.getLayoutAdapter().addBean(creator, x, y); if (creator.shouldScaleCreator() || creator.hasTitleStyle()) { addParentCreator(creator); } else { @@ -303,7 +304,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter { XWAbsoluteLayout layout = (XWAbsoluteLayout) container; layout.updateBoundsWidget(creator); } - + /** * 调整组件大小到合适尺寸位置 * @param creator 组件 @@ -338,4 +339,4 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter { XWAbsoluteLayout xwAbsoluteLayout = (XWAbsoluteLayout) container; return new FRAbsoluteLayoutPropertiesGroupModel(xwAbsoluteLayout); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java index 05da6975c..5a31bab40 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRBodyLayoutAdapter.java @@ -593,26 +593,26 @@ public class FRBodyLayoutAdapter extends AbstractLayoutAdapter { switch (position) { case COMP_TOP: dim.width = maxWidth; - dim.height = maxHeight / 2; - finalY = yL + dim.height; - finalH = maxHeight - dim.height; + dim.height = maxHeight / 2 - actualVal / 2; + finalY = yL + dim.height + actualVal; + finalH = maxHeight - dim.height - actualVal; break; case COMP_BOTTOM: - dim.height = maxHeight / 2; + dim.height = maxHeight / 2 - actualVal / 2; dim.width = maxWidth; - finalH = maxHeight - dim.height; - yL = yL + finalH; + finalH = maxHeight - dim.height - actualVal; + yL = yL + finalH + actualVal; break; case COMP_LEFT: - dim.width = maxWidth / 2; + dim.width = maxWidth / 2 - actualVal / 2; dim.height = maxHeight; - finalX = xL + dim.width; - finalW = maxWidth - dim.width; + finalX = xL + dim.width + actualVal; + finalW = maxWidth - dim.width - actualVal; break; default: - finalW = maxWidth / 2; - xL = xL + finalW; - dim.width = maxWidth - finalW; + finalW = maxWidth / 2 - actualVal / 2; + xL = xL + finalW + actualVal; + dim.width = maxWidth - finalW - actualVal; dim.height = maxHeight; } if (isCalculateChildPos) { 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 9aa9e5ab9..b08c6f751 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 @@ -10,6 +10,7 @@ import com.fr.design.designer.beans.painters.FRFitLayoutPainter; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.designer.creator.XLayoutContainer; +import com.fr.design.designer.creator.XWAbsoluteLayout; import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; @@ -150,7 +151,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter { //布局控件要先判断是不是可编辑 XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator) comp).getTopLayout(); - if (topLayout != null && !isMatchEdge && !topLayout.isEditable()) { + if (topLayout != null && !isMatchEdge && !topLayout.isEditable() && !topLayout.acceptType(XWAbsoluteLayout.class)) { return false; } @@ -1221,4 +1222,4 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter { public ConstraintsGroupModel getLayoutConstraints(XCreator creator) { return new FRFitLayoutConstraints((XWFitLayout) container, creator); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java index b1ca803c6..70a5d5df0 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRTabFitLayoutAdapter.java @@ -74,7 +74,8 @@ public class FRTabFitLayoutAdapter extends FRFitLayoutAdapter { XWTabFitLayout tabLayout = (XWTabFitLayout) backUpContainer; y = adjustY(y, tabLayout); } - addComp(creator, x, y); + //这时候应该要用计算后的父fit布局添加 + this.container.getLayoutAdapter().addBean(creator, x, y); ((XWidgetCreator) creator).recalculateChildrenSize(); return true; } @@ -102,4 +103,4 @@ public class FRTabFitLayoutAdapter extends FRFitLayoutAdapter { return ComponentUtils.getRelativeBounds(mainLayout); } -} \ No newline at end of file +} From 24087923e2102c3aa659a63ba048d1e9d4f07d9d Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 5 Nov 2019 14:55:46 +0800 Subject: [PATCH 06/13] =?UTF-8?q?REPORT-23494=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=90=8D=E5=90=8E=20=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BA=8B=E4=BB=B6=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E4=BC=9A=E8=A2=AB=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/designer/properties/EventPropertyTable.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java index ec953b9da..2a3ab3dac 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java @@ -98,6 +98,7 @@ public class EventPropertyTable extends UIListControlPane { Widget widget = creator.toData(); refreshNameableCreator(EventCreator.createEventCreator(widget.supportedEvents(), WidgetEventListenerUpdatePane.class)); + populateNameObjects(); } public void populateNameObjects() { From d8f99774674ced5aef35f768c99ffd6a5cd6fb46 Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 6 Nov 2019 11:53:37 +0800 Subject: [PATCH 07/13] =?UTF-8?q?REPORT-23246=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8UI=20=E6=8F=92=E5=85=A5=E6=96=9C=E7=BA=BF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/utils/gui/FineDesignScreen.java | 36 +++++++++++++++++++ .../editor/BiasTextPainterCellEditor.java | 5 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/utils/gui/FineDesignScreen.java diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/FineDesignScreen.java b/designer-base/src/main/java/com/fr/design/utils/gui/FineDesignScreen.java new file mode 100644 index 000000000..13fca5aa5 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/utils/gui/FineDesignScreen.java @@ -0,0 +1,36 @@ +package com.fr.design.utils.gui; + +import com.fr.stable.os.OperatingSystem; + +import java.awt.*; + +/** + * @author hades + * @version 10.0 + * Created by hades on 2019/10/29 + */ +public enum FineDesignScreen { + + /** + * 一个临界dpi + * 设计器(windows/linux)大于等于该dpi界面ui变得很小 (jdk bug 在jdk9修复: http://openjdk.java.net/jeps/263) + */ + DPI_144(144); + + private int value; + + FineDesignScreen(int value) { + this.value = value; + } + + /** + * 判断win/linux下的dpi macos不做处理 + * @return + */ + public static boolean isHighDPI() { + if (OperatingSystem.isMacos()) { + return false; + } + return Toolkit.getDefaultToolkit().getScreenResolution() >= DPI_144.value; + } +} diff --git a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java index 85b602c42..ab737812f 100644 --- a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java +++ b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java @@ -10,6 +10,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.utils.gui.FineDesignScreen; import com.fr.general.ComparatorUtils; import com.fr.grid.Grid; import com.fr.report.cell.TemplateCellElement; @@ -35,7 +36,7 @@ import java.awt.event.ActionListener; public class BiasTextPainterCellEditor extends AbstractCellEditor { private BiasTextPainterPane biasTextPainterPane = null; - private static final double MULTIPLE = 1.5; + private static final double MULTIPLE = FineDesignScreen.isHighDPI() ? 2 : 1.5; /** * Constructor. @@ -114,7 +115,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor { //center JPanel centerPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); - defaultPane.add(centerPane, BorderLayout.CENTER); + defaultPane.add(centerPane, BorderLayout.NORTH); //text JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); From 820fcc273072d7f72348d7e73fe9284934691322 Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 6 Nov 2019 12:49:41 +0800 Subject: [PATCH 08/13] fix --- .../com/fr/design/cell/editor/BiasTextPainterCellEditor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java index ab737812f..e97a92b4d 100644 --- a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java +++ b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java @@ -115,7 +115,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor { //center JPanel centerPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); - defaultPane.add(centerPane, BorderLayout.NORTH); + defaultPane.add(centerPane, BorderLayout.CENTER); //text JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); From e0eb45ed53af6f2e502898502d61a16f4232ab41 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 7 Nov 2019 17:07:37 +0800 Subject: [PATCH 09/13] =?UTF-8?q?REPORT-23246=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E8=AE=BE=E7=BD=AE=E7=BA=B8=E5=BC=A0=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2=E4=BC=9A=E5=8F=98=E7=99=BD=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-realize/src/main/java/com/fr/grid/GridUI.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/grid/GridUI.java b/designer-realize/src/main/java/com/fr/grid/GridUI.java index 1bb88c7b0..41ea56513 100644 --- a/designer-realize/src/main/java/com/fr/grid/GridUI.java +++ b/designer-realize/src/main/java/com/fr/grid/GridUI.java @@ -477,7 +477,14 @@ public class GridUI extends ComponentUI { this.tmpRectangle.getHeight() - 1); // peter:对于合并的单元格,需要先白色的背景来清除背景. if (tmpCellElement.getColumnSpan() > 1 || tmpCellElement.getRowSpan() > 1) { - WHITE_Backgorund.paint(g2d, this.cell_back_rect); + // REPORT-23492 要看下是否设置了纸张背景 如果设置了按照背景来画 + ReportSettingsProvider reportSettings = getReportSettings(reportPane.getEditingElementCase()); + Background currentBackground = reportSettings.getBackground(); + if (currentBackground != null) { + currentBackground.paint(g2d, this.cell_back_rect); + } else { + WHITE_Backgorund.paint(g2d, this.cell_back_rect); + } //daniel:上面这里就有问题了啊....报表的背景在这个之前画的 会覆盖报表背景....不过只是设计器中看到预览浏览没问题 } // peter:将这个元素添加到需要paint的元素列表当中去,留着画边框线.. From c68dc8671749787e0ea12a90291e4c0bf1d9a5b7 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 7 Nov 2019 17:15:33 +0800 Subject: [PATCH 10/13] fix --- designer-realize/src/main/java/com/fr/grid/GridUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/grid/GridUI.java b/designer-realize/src/main/java/com/fr/grid/GridUI.java index 41ea56513..1ae96b61b 100644 --- a/designer-realize/src/main/java/com/fr/grid/GridUI.java +++ b/designer-realize/src/main/java/com/fr/grid/GridUI.java @@ -478,7 +478,7 @@ public class GridUI extends ComponentUI { // peter:对于合并的单元格,需要先白色的背景来清除背景. if (tmpCellElement.getColumnSpan() > 1 || tmpCellElement.getRowSpan() > 1) { // REPORT-23492 要看下是否设置了纸张背景 如果设置了按照背景来画 - ReportSettingsProvider reportSettings = getReportSettings(reportPane.getEditingElementCase()); + ReportSettingsProvider reportSettings = getReportSettings(report); Background currentBackground = reportSettings.getBackground(); if (currentBackground != null) { currentBackground.paint(g2d, this.cell_back_rect); From e820e2a456d1c50ad04d9e07309141d3bd86e9fb Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 7 Nov 2019 19:59:58 +0800 Subject: [PATCH 11/13] =?UTF-8?q?REPORT-22595=E3=80=9010.0.4=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E3=80=91=E5=BC=80=E5=8F=91=E8=80=85=E9=B8=A3?= =?UTF-8?q?=E8=B0=A2=EF=BC=8C=E6=94=BE=E5=88=B0=E5=90=AF=E5=8A=A8=E5=9B=BE?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E4=B8=8B=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/common/SplashPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java index a96efe76f..bbd0cab0f 100644 --- a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java +++ b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java @@ -28,10 +28,10 @@ public class SplashPane extends JPanel { private static final Color MODULE_COLOR = new Color(255, 255, 255); private static final int MODULE_INFO_X = uiScale(36); - private static final int MODULE_INFO_Y = uiScale(339); + private static final int MODULE_INFO_Y = uiScale(300); private static final Color THANK_COLOR = new Color(255, 255, 255, (int) (0.6 * 255 + 0.5)); - private static final int THANK_INFO_X = uiScale(470); + private static final int THANK_INFO_Y = uiScale(340); private static final int FONT_SIZE = uiScale(12); private static final int MODULE_INFO_WIDTH = uiScale(150); @@ -84,7 +84,7 @@ public class SplashPane extends JPanel { //感谢用户信息 if (StringUtils.isNotEmpty(thanksLog)) { g.setPaint(THANK_COLOR); - GraphHelper.drawString(g, thanksLog, THANK_INFO_X, MODULE_INFO_Y); + GraphHelper.drawString(g, thanksLog, MODULE_INFO_X, THANK_INFO_Y); } config.restore(); } @@ -114,7 +114,7 @@ public class SplashPane extends JPanel { void updateThanksLog(String text) { thanksLog = text; - repaint(THANK_INFO_X, MODULE_INFO_Y - FONT_SIZE, MODULE_INFO_WIDTH, MODULE_INFO_HEIGHT); + repaint(MODULE_INFO_X, THANK_INFO_Y - FONT_SIZE, MODULE_INFO_WIDTH, MODULE_INFO_HEIGHT); } } From 18b35deef881a9659f94bb5cad49a7623b43eba1 Mon Sep 17 00:00:00 2001 From: Bryant Date: Mon, 11 Nov 2019 15:23:19 +0800 Subject: [PATCH 12/13] =?UTF-8?q?REPORT-22108=20=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E5=86=99=E6=AD=BB=E4=BA=86=EF=BC=8C=E4=B8=80=E6=97=A6=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E4=BA=8630=E8=A1=8C=E5=B0=B1=E4=BC=9A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/EmbeddedTableDataPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java index cb6c63a36..a506e86f8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java @@ -220,7 +220,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane Date: Mon, 11 Nov 2019 15:34:38 +0800 Subject: [PATCH 13/13] =?UTF-8?q?REPORT-22108=20=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E5=86=99=E6=AD=BB=E4=BA=86=EF=BC=8C=E4=B8=80=E6=97=A6=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E4=BA=8630=E5=88=97=E5=B0=B1=E4=BC=9A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java | 2 +- .../data/tabledata/tabledatapane/EmbeddedTableDataPane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java index 48d36e247..6a3b707ab 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java @@ -64,7 +64,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ // 行号显示 TableColumn tableColumn = dataJTable.getColumnModel().getColumn(0); tableColumn.setCellRenderer(new CellRenderer()); - tableColumn.setMaxWidth(30); + tableColumn.setMaxWidth(dataJTable.getColumnCount()); // 控制按钮 add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java index a506e86f8..afefe7264 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java @@ -220,7 +220,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane