diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index d94ac661b..1235419f5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -591,7 +591,6 @@ public abstract class JTemplate> return false; } editingFILE = fileChooser.getSelectedFILE(); - mkNewFile(editingFILE); } return saveNewFile(editingFILE, oldName); diff --git a/designer-base/src/main/java/com/fr/file/FileFILE.java b/designer-base/src/main/java/com/fr/file/FileFILE.java index b9c4f7bb0..ee92205f5 100644 --- a/designer-base/src/main/java/com/fr/file/FileFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileFILE.java @@ -194,11 +194,12 @@ public class FileFILE implements FILE { * @return 输出流 */ public OutputStream asOutputStream() { - if (file == null || !file.exists()) { + if (file == null) { return null; } OutputStream out; try { + StableUtils.makesureFileExist(file); out = new FileOutputStream(file); } catch (Exception e) { throw SessionLocalManager.createLogPackedException(e); diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java index 04016c503..d077a342e 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -14,7 +14,7 @@ import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; import com.fr.workspace.WorkContext; -import com.fr.workspace.resource.WorkResourceOutputStream; +import com.fr.workspace.resource.WorkResourceTempRenameStream; import javax.swing.Icon; import java.io.ByteArrayInputStream; @@ -381,7 +381,7 @@ public class FileNodeFILE implements FILE { if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) { return null; } - return new WorkResourceOutputStream(envPath); + return new WorkResourceTempRenameStream(envPath); } /** diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png b/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png index 4fd2df684..7fa4a9899 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png b/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png index 24393bc4b..866aa8589 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/center.png b/designer-base/src/main/resources/com/fr/design/images/bbs/center.png index 1d464ba9b..c5ccd688d 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/center.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/center.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png b/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png index b237026fa..cf115b543 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/help.png b/designer-base/src/main/resources/com/fr/design/images/bbs/help.png index c13f2f192..796d7da6c 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/help.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/help.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/need.png b/designer-base/src/main/resources/com/fr/design/images/bbs/need.png index 486ff9846..2c95e50ee 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/need.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/need.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/question.png b/designer-base/src/main/resources/com/fr/design/images/bbs/question.png index c8c6fd8a1..ffdbdacb8 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/question.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/question.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png b/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png index b1556f7ed..c48caf015 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png b/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png index f09230674..f22f85d23 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/video.png b/designer-base/src/main/resources/com/fr/design/images/bbs/video.png index 1971f2615..7178b11a0 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/bbs/video.png and b/designer-base/src/main/resources/com/fr/design/images/bbs/video.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png index 2f68dcf8f..f2f2d480f 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png index 33af5fd2f..d5e0cbfa7 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png index 9ff66acaf..e92444ceb 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png index 8fd08de55..51e163658 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png index b838ac93b..32cee1815 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png index 6b651248c..f1c6de185 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png index 9435a61d7..d4bf13edd 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png index 2c62da86b..8af36d06a 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png index 055502cb2..e204e0659 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png index 754781f9f..e2c400e63 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png index 0d0cb9e06..9466e8326 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png index 073de2b09..a1b373190 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png index 24a2aaa3e..3a06f0ec6 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png index e1ab5c313..d2730204a 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png index 2f68dcf8f..a24990124 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png index 473baff55..6bfd8bbb9 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png index 1f28a0943..e0e124def 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png index 055502cb2..db64b46e6 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png index 63c460d69..6bd4ebbb7 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png index 5b8f0ff2f..3fc1a0269 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png differ diff --git a/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png index 09edd2b77..f90e6afed 100644 Binary files a/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png and b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png differ diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java index 4dd9fa6b9..a61cd7a3c 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java @@ -8,12 +8,10 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; - import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.FlowLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -23,6 +21,7 @@ import java.awt.event.ItemListener; */ public class NoClientPrintSettingPane extends JPanel { private UICheckBox setMarginWhenPrintCheck; + private UICheckBox ieQuietPrintCheck; private UICheckBox inheritPageMarginSettingCheck; // 继承页面边距设置 private PageMarginSettingPane pageMarginSettingPane; private JPanel centerPane; @@ -35,15 +34,16 @@ public class NoClientPrintSettingPane extends JPanel { private void initComponents() { JPanel printPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing")); - setMarginWhenPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20)); - UILabel tipLabel = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Print_Margin")); - JPanel northPane = GUICoreUtils.createFlowPane(new Component[] { - setMarginWhenPrintCheck, tipLabel}, FlowLayout.LEFT); - northPane.setBorder(BorderFactory.createEmptyBorder(8, 10, 10, 0)); + printPane.add(createNorthPane(), BorderLayout.NORTH); + + initCenterPane(); + printPane.add(centerPane, BorderLayout.CENTER); - printPane.add(northPane, BorderLayout.NORTH); + this.setLayout(new BorderLayout()); + this.add(printPane, BorderLayout.CENTER); + } + private void initCenterPane() { centerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default_Settings")); inheritPageMarginSettingCheck = GUICoreUtils.createNoBorderCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inherit_Page_Margin_Setting")); @@ -61,11 +61,27 @@ public class NoClientPrintSettingPane extends JPanel { JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); centerPane.add(panel); + } - printPane.add(centerPane, BorderLayout.CENTER); + private JPanel createNorthPane() { + setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing")); + setMarginWhenPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 20)); + UILabel tipLabel = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Print_Margin")); + ieQuietPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No_Print_Settings_In_IE")); + ieQuietPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 12, 10, 0)); - this.setLayout(new BorderLayout()); - this.add(printPane, BorderLayout.CENTER); + // TableLayout + double p = TableLayout.PREFERRED; + double[] rowSize = {p, p}; + double[] columnSize = {180, p}; + Component[][] components = { + {setMarginWhenPrintCheck, tipLabel}, + {ieQuietPrintCheck, null} + }; + JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 10); + northPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); + + return northPane; } private void initListeners() { @@ -86,12 +102,14 @@ public class NoClientPrintSettingPane extends JPanel { public void populate(NoClientPrintAttr noClientPrintAttr) { setMarginWhenPrintCheck.setSelected(noClientPrintAttr.isSetMarginOnPrint()); + ieQuietPrintCheck.setSelected(noClientPrintAttr.isIeQuietPrint()); inheritPageMarginSettingCheck.setSelected(noClientPrintAttr.isInheritPageMarginSetting()); pageMarginSettingPane.populate(noClientPrintAttr.getMargin()); } public void update(NoClientPrintAttr noClientPrintAttr) { noClientPrintAttr.setSetMarginOnPrint(setMarginWhenPrintCheck.isSelected()); + noClientPrintAttr.setIeQuietPrint(ieQuietPrintCheck.isSelected()); noClientPrintAttr.setInheritPageMarginSetting(inheritPageMarginSettingCheck.isSelected()); noClientPrintAttr.setMargin(pageMarginSettingPane.updateBean()); } diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index c362916c9..b0d4b398b 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -41,6 +41,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.module.Module; import com.fr.module.ModuleContext; +import com.fr.runtime.FineRuntime; import com.fr.stable.BuildContext; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; @@ -93,7 +94,9 @@ public class Designer extends BaseDesigner { * @param args 参数 */ public static void main(String[] args) { - + + //启动运行时 + FineRuntime.start(); BuildContext.setBuildFilePath("/com/fr/stable/build.properties");