From f1136842ad579fe1b3d62373a57defa0da5b80fc Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 9 Aug 2016 17:36:46 +0800 Subject: [PATCH 01/14] update --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 500ece8b4..420986ce3 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -38,6 +38,8 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import javax.swing.*; +import java.io.File; +import java.lang.reflect.Constructor; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -48,6 +50,9 @@ import java.util.Map; */ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraChartDesignClassManagerProvider { + + + private static ClassLoader loader = Thread.currentThread().getContextClassLoader(); private static ChartTypeInterfaceManager classManager = null; From 77f45d7acc1c78c9561e77eefd74f98fe4e2eb40 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 9 Aug 2016 17:38:55 +0800 Subject: [PATCH 02/14] update --- designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 269371fbf..1d5cd101a 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -38,8 +38,6 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import javax.swing.*; -import java.io.File; -import java.lang.reflect.Constructor; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; From 242c290cd2437a34a47245235545269f6006800b Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Tue, 9 Aug 2016 17:43:37 +0800 Subject: [PATCH 03/14] update --- .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 1de992158..8495eedf3 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -125,6 +125,8 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } fire(); + + collection.getSelectedChart().getPlot().setAttrChange(true); } } }; From 92ea24eab39d5e664a0f217855e5a3a3d7aeb3d2 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 10 Aug 2016 11:35:49 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=94=B9=E5=8F=98=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_chart/src/com/fr/design/image/ImageListener.java | 7 +++++++ .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 designer_chart/src/com/fr/design/image/ImageListener.java diff --git a/designer_chart/src/com/fr/design/image/ImageListener.java b/designer_chart/src/com/fr/design/image/ImageListener.java new file mode 100644 index 000000000..b24bc5f94 --- /dev/null +++ b/designer_chart/src/com/fr/design/image/ImageListener.java @@ -0,0 +1,7 @@ +package com.fr.design.image; + +/** + * Created by hufan on 2016/8/10. + */ +public interface ImageListener { +} diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 8495eedf3..c39aca7bd 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -115,6 +115,11 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 AbstractChartAttrPane selectedPane = paneList.get(tabsHeaderIconPane.getSelectedIndex()); selectedPane.update(collection); if (!ComparatorUtils.equals(collection, lastCollection)) { + + //此处画图 + Chart chart = collection.getSelectedChart(); + chart.demoImgEvent(true); + try { lastCollection = (ChartCollection) collection.clone(); } catch (CloneNotSupportedException e) { @@ -125,8 +130,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } fire(); - - collection.getSelectedChart().getPlot().setAttrChange(true); } } }; From 488c074690d6f6c517dd49dd66501135b557e84a Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Wed, 10 Aug 2016 11:47:07 +0800 Subject: [PATCH 05/14] update --- designer_chart/src/com/fr/design/image/ImageListener.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 designer_chart/src/com/fr/design/image/ImageListener.java diff --git a/designer_chart/src/com/fr/design/image/ImageListener.java b/designer_chart/src/com/fr/design/image/ImageListener.java deleted file mode 100644 index b24bc5f94..000000000 --- a/designer_chart/src/com/fr/design/image/ImageListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.fr.design.image; - -/** - * Created by hufan on 2016/8/10. - */ -public interface ImageListener { -} From 518254d0065249829b0dace101933751b8515978 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 10 Aug 2016 14:24:56 +0800 Subject: [PATCH 06/14] =?UTF-8?q?bug88297:=E4=BD=BF=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E6=9B=B4=E6=96=B0=E6=8F=92=E4=BB=B6=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=9C=89=E7=9A=84jar=E5=8C=85=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E6=80=A7=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/RestartHelper.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/designer_base/src/com/fr/design/RestartHelper.java b/designer_base/src/com/fr/design/RestartHelper.java index 4dff98615..53aa5e56b 100644 --- a/designer_base/src/com/fr/design/RestartHelper.java +++ b/designer_base/src/com/fr/design/RestartHelper.java @@ -4,15 +4,11 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.GeneralUtils; -import com.fr.stable.ArrayUtils; -import com.fr.stable.OperatingSystem; -import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; +import com.fr.stable.*; + +import java.io.*; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -153,6 +149,18 @@ public class RestartHelper { } try { + try { + File restartLockFile = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), "restart.lock")); + StableUtils.makesureFileExist(restartLockFile); + RandomAccessFile randomAccessFile = new RandomAccessFile(restartLockFile,"rw"); + FileChannel restartLockFC = randomAccessFile.getChannel(); + FileLock restartLock = restartLockFC.tryLock(); + if(restartLock == null) { + FRLogger.getLogger().error("restart lock null!"); + } + }catch (Exception e){ + FRLogger.getLogger().error(e.getMessage()); + } if (OperatingSystem.isMacOS()) { restartInMacOS(installHome, filesToBeDelete); } else { From bf93c680efda465079e7ef56dd994842fde90904 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 10 Aug 2016 17:20:31 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=B0=81=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E4=BB=8E=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E4=BD=8D=E7=BD=AE=E5=B1=8F=E8=94=BD=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/gui/core/FormWidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index 76287c30f..e99888c72 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 上午10:40 */ public class FormWidgetOption extends WidgetOption { /** * 返回名字 * @return 名字 */ @Override public String optionName() { return null; } /** * 返回图标 * @return 图标 */ @Override public Icon optionIcon() { return null; } /** * 组件类 * @return 类 */ @Override public Class widgetClass() { return null; } /** * 返回组件 * @return 控件 */ @Override public Widget createWidget() { return null; } /* * 表单容器 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 表单工具栏上的布局 * @return 控件 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file +package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 上午10:40 */ public class FormWidgetOption extends WidgetOption { /** * 返回名字 * @return 名字 */ @Override public String optionName() { return null; } /** * 返回图标 * @return 图标 */ @Override public Icon optionIcon() { return null; } /** * 组件类 * @return 类 */ @Override public Class widgetClass() { return null; } /** * 返回组件 * @return 控件 */ @Override public Widget createWidget() { return null; } /* * 表单容器 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 表单工具栏上的布局 * @return 控件 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file From c2187ec556df112cd55eb79bf4ef5ab2f68fb152 Mon Sep 17 00:00:00 2001 From: zhouping Date: Wed, 10 Aug 2016 19:02:28 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=B0=81=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E7=9A=84=E7=AD=89=E8=B7=9D?= =?UTF-8?q?=E7=BA=BF=E5=B1=8F=E8=94=BD=E6=8E=89=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/beans/location/MoveUtils.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/designer_base/src/com/fr/design/beans/location/MoveUtils.java b/designer_base/src/com/fr/design/beans/location/MoveUtils.java index 18c282cdc..fe80b463a 100644 --- a/designer_base/src/com/fr/design/beans/location/MoveUtils.java +++ b/designer_base/src/com/fr/design/beans/location/MoveUtils.java @@ -300,11 +300,13 @@ public class MoveUtils { findX(px, bounds, left, right, width); findY(py, bounds, top, bottom, height); - if(isIntersects && !isParameterLayout){ - isWidgetsIntersects = true; - } - else{ - findEquidistantLine(bounds, left, top, height, width); + if(!isParameterLayout){ + if(isIntersects) { + isWidgetsIntersects = true; + } + else{ + findEquidistantLine(bounds, left, top, height, width); + } } } showForbiddenWindow(designer, x, y, isWidgetsIntersects); From 67ce32c438b157dd8c493917d7ea17ddf4b38e36 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 11 Aug 2016 09:26:11 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A1=86=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java index 46245560a..9d278d048 100644 --- a/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java +++ b/designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java @@ -32,7 +32,7 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt private void initComponents() { JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced")); - advancedPane.setPreferredSize(new Dimension(600,300)); + advancedPane.setPreferredSize(new Dimension(600, 341)); JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4)); this.add(advancedPane); From 801040bf5899cfc740b6028c456471d1b5fe6429 Mon Sep 17 00:00:00 2001 From: fangdong sun Date: Thu, 11 Aug 2016 09:36:22 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/build.gradle | 2 +- designer_chart/build.gradle | 2 +- designer_form/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/build.gradle b/designer_base/build.gradle index 926e87e43..a48a4d2c5 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -53,7 +53,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 46717d4ac..2b465eca9 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -51,7 +51,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 4409495b9..9b4b7eb21 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -63,7 +63,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../../finereport-build-stable',includes:'**/*.jar') + fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ From d78eb67dd9fe5afbb96fcd17a6b4c4ed0b5a4719 Mon Sep 17 00:00:00 2001 From: Fangjie Hu Date: Thu, 11 Aug 2016 15:19:55 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=96=B0=E5=9B=BE=E6=A0=87=E7=9F=A9?= =?UTF-8?q?=E5=BD=A2=E5=9B=BE=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E5=8F=AF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=9C=86=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/series/SeriesCondition/LabelBorderAttrPane.java | 6 +++++- .../chart/series/SeriesCondition/LabelBorderPane.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java index 86e958623..676fef17d 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java @@ -24,7 +24,7 @@ public abstract class LabelBorderAttrPane extends ConditionAttrSingleConditionPa public LabelBorderAttrPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove, String label) { super(conditionAttributesPane, isRemove); nameLabel = new UILabel(label); - linePane = new BorderAttriPane(); + linePane = initBorderAttrPane(); if (isRemove) { this.add(nameLabel); @@ -33,6 +33,10 @@ public abstract class LabelBorderAttrPane extends ConditionAttrSingleConditionPa this.labelName = label; } + protected BorderAttriPane initBorderAttrPane(){ + return new BorderAttriPane(); + } + @Override public String nameForPopupMenuItem() { return labelName; diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java index cc9385d3a..e4e1b3548 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java @@ -12,7 +12,7 @@ import com.fr.general.Inter; */ public class LabelBorderPane extends LabelBorderAttrPane { - private AttrBorder attrBorder = new AttrBorder(); + protected AttrBorder attrBorder = new AttrBorder(); public LabelBorderPane(ConditionAttributesPane conditionAttributesPane) { super(conditionAttributesPane, true, Inter.getLocText(new String[]{"Border", "Format"})); From f3fa01d795ad0da213d177145b5b27f71442ca77 Mon Sep 17 00:00:00 2001 From: zpc Date: Thu, 11 Aug 2016 15:59:58 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8bug,=20?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=82=A3=E8=BE=B9=E9=80=89?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E5=BD=A2=E6=80=81,=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=85=AC=E5=BC=8F,=20=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=AD=89=E6=A0=BC=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式. --- .../src/com/fr/design/condition/PresentHighlightPane.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java index f306ec0f7..6883373a7 100644 --- a/designer/src/com/fr/design/condition/PresentHighlightPane.java +++ b/designer/src/com/fr/design/condition/PresentHighlightPane.java @@ -97,11 +97,14 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane Date: Thu, 11 Aug 2016 16:58:11 +0800 Subject: [PATCH 13/14] =?UTF-8?q?release=E7=9A=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/FRParameterLayoutAdapter.java | 69 ++++++++++++++++++- .../designer/creator/XWParameterLayout.java | 9 +++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java index 65858c299..c88579c41 100644 --- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java +++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java @@ -1,14 +1,20 @@ package com.fr.design.designer.beans.adapters.layout; import com.fr.design.beans.GroupModel; +import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.beans.HoverPainter; import com.fr.design.designer.beans.painters.FRParameterLayoutPainter; 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.XWParameterLayout; import com.fr.design.form.parameter.RootDesignGroupModel; +import com.fr.design.utils.ComponentUtils; +import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.container.WParameterLayout; +import java.awt.*; + /** * 表单参数界面的监听器 */ @@ -39,5 +45,66 @@ public class FRParameterLayoutAdapter extends FRAbsoluteLayoutAdapter { WParameterLayout wabs = (WParameterLayout)container.toData(); wabs.refreshTagList(); } - + + /** + * 是否能在指定位置添加组件 + * + * @param creator 组件 + * @param x 坐标x + * @param y 坐标y + * @return 能则返回true + */ + @Override + public boolean accept(XCreator creator, int x, int y) { + return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight() + && creator.getWidth() <= container.getWidth(); + } + + @Override + protected void addComp(XCreator creator, int x, int y) { + if (XCreatorUtils.getParentXLayoutContainer(creator) != null) { + Rectangle r = ComponentUtils.getRelativeBounds(container); + Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator); + x = creatorRectangle.x - r.x; + y = creatorRectangle.y - r.y; + } else { + int w = creator.getWidth() / 2; + int h = creator.getHeight() / 2; + x = x - w; + y = y - h; + } + + fix(creator, x, y); + container.add(creator); + LayoutUtils.layoutRootContainer(container); + } + + /** + * 调整组件大小到合适尺寸位置 + * + * @param creator 组件 + * @param x 坐标x + * @param y 坐标y + */ + @Override + public void fix(XCreator creator, int x, int y) { + if (x < 0) { + x = 0; + } else if (x + creator.getWidth() > container.getWidth()) { + x = container.getWidth() - creator.getWidth(); + } + + if (y < 0) { + y = 0; + } else if (y + creator.getHeight() > container.getHeight()) { + y = container.getHeight() - creator.getHeight(); + } + + creator.setLocation(x, y); + } + + @Override + public ConstraintsGroupModel getLayoutConstraints(XCreator creator) { + return super.getLayoutConstraints(creator); + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java index 890612ccc..e1ab80b7c 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java @@ -174,4 +174,13 @@ public class XWParameterLayout extends XWAbsoluteLayout { public XLayoutContainer getTopLayout() { return this; } + + /** + * 新增删除拉伸后更新每个组件的BoundsWidget + * + * @param xCreator + */ + @Override + public void updateBoundsWidget(XCreator xCreator) { + } } \ No newline at end of file From 602e6d49a52cbfd9a58c50132e76c98f0b89f47d Mon Sep 17 00:00:00 2001 From: zpc Date: Fri, 12 Aug 2016 09:36:57 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 条件属性切换形态问题 --- .../src/com/fr/design/condition/PresentHighlightPane.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java index 6883373a7..2269ceca1 100644 --- a/designer/src/com/fr/design/condition/PresentHighlightPane.java +++ b/designer/src/com/fr/design/condition/PresentHighlightPane.java @@ -109,11 +109,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane