Browse Source

Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into feature/10.0

research/10.0
alex.sung 6 years ago
parent
commit
c94806219d
  1. 1
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  2. 3
      designer-base/src/main/java/com/fr/file/FileFILE.java
  3. 4
      designer-base/src/main/java/com/fr/file/FileNodeFILE.java
  4. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png
  5. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/bug.png
  6. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/center.png
  7. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/demand.png
  8. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/help.png
  9. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/need.png
  10. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/question.png
  11. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/sign.png
  12. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/solution.png
  13. BIN
      designer-base/src/main/resources/com/fr/design/images/bbs/video.png
  14. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png
  15. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png
  16. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png
  17. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png
  18. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png
  19. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png
  20. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png
  21. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png
  22. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png
  23. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png
  24. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png
  25. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png
  26. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png
  27. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png
  28. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png
  29. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png
  30. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png
  31. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png
  32. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png
  33. BIN
      designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png
  34. BIN
      designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png
  35. 42
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java
  36. 3
      designer-realize/src/main/java/com/fr/start/Designer.java

1
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -591,7 +591,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
return false; return false;
} }
editingFILE = fileChooser.getSelectedFILE(); editingFILE = fileChooser.getSelectedFILE();
mkNewFile(editingFILE);
} }
return saveNewFile(editingFILE, oldName); return saveNewFile(editingFILE, oldName);

3
designer-base/src/main/java/com/fr/file/FileFILE.java

@ -194,11 +194,12 @@ public class FileFILE implements FILE {
* @return 输出流 * @return 输出流
*/ */
public OutputStream asOutputStream() { public OutputStream asOutputStream() {
if (file == null || !file.exists()) { if (file == null) {
return null; return null;
} }
OutputStream out; OutputStream out;
try { try {
StableUtils.makesureFileExist(file);
out = new FileOutputStream(file); out = new FileOutputStream(file);
} catch (Exception e) { } catch (Exception e) {
throw SessionLocalManager.createLogPackedException(e); throw SessionLocalManager.createLogPackedException(e);

4
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.StableUtils;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.resource.WorkResourceOutputStream; import com.fr.workspace.resource.WorkResourceTempRenameStream;
import javax.swing.Icon; import javax.swing.Icon;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -381,7 +381,7 @@ public class FileNodeFILE implements FILE {
if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) { if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) {
return null; return null;
} }
return new WorkResourceOutputStream(envPath); return new WorkResourceTempRenameStream(envPath);
} }
/** /**

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 350 B

After

Width:  |  Height:  |  Size: 272 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/bug.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 560 B

After

Width:  |  Height:  |  Size: 352 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/center.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 199 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/demand.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 379 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/help.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 225 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/need.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 326 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/question.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 600 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/sign.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 388 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/solution.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 309 B

BIN
designer-base/src/main/resources/com/fr/design/images/bbs/video.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 449 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 423 B

After

Width:  |  Height:  |  Size: 473 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 143 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 379 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 643 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 314 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 156 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 800 B

After

Width:  |  Height:  |  Size: 638 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 629 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 576 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1002 B

After

Width:  |  Height:  |  Size: 808 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 188 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 172 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 405 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 581 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 423 B

After

Width:  |  Height:  |  Size: 523 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 422 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 144 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 718 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 580 B

BIN
designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 125 B

BIN
designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 B

After

Width:  |  Height:  |  Size: 181 B

42
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.layout.TableLayoutHelper;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.FlowLayout;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
@ -23,6 +21,7 @@ import java.awt.event.ItemListener;
*/ */
public class NoClientPrintSettingPane extends JPanel { public class NoClientPrintSettingPane extends JPanel {
private UICheckBox setMarginWhenPrintCheck; private UICheckBox setMarginWhenPrintCheck;
private UICheckBox ieQuietPrintCheck;
private UICheckBox inheritPageMarginSettingCheck; // 继承页面边距设置 private UICheckBox inheritPageMarginSettingCheck; // 继承页面边距设置
private PageMarginSettingPane pageMarginSettingPane; private PageMarginSettingPane pageMarginSettingPane;
private JPanel centerPane; private JPanel centerPane;
@ -35,15 +34,16 @@ public class NoClientPrintSettingPane extends JPanel {
private void initComponents() { private void initComponents() {
JPanel printPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel printPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing")); printPane.add(createNorthPane(), BorderLayout.NORTH);
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")); initCenterPane();
JPanel northPane = GUICoreUtils.createFlowPane(new Component[] { printPane.add(centerPane, BorderLayout.CENTER);
setMarginWhenPrintCheck, tipLabel}, FlowLayout.LEFT);
northPane.setBorder(BorderFactory.createEmptyBorder(8, 10, 10, 0));
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")); 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")); 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); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15);
centerPane.add(panel); 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()); // TableLayout
this.add(printPane, BorderLayout.CENTER); 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() { private void initListeners() {
@ -86,12 +102,14 @@ public class NoClientPrintSettingPane extends JPanel {
public void populate(NoClientPrintAttr noClientPrintAttr) { public void populate(NoClientPrintAttr noClientPrintAttr) {
setMarginWhenPrintCheck.setSelected(noClientPrintAttr.isSetMarginOnPrint()); setMarginWhenPrintCheck.setSelected(noClientPrintAttr.isSetMarginOnPrint());
ieQuietPrintCheck.setSelected(noClientPrintAttr.isIeQuietPrint());
inheritPageMarginSettingCheck.setSelected(noClientPrintAttr.isInheritPageMarginSetting()); inheritPageMarginSettingCheck.setSelected(noClientPrintAttr.isInheritPageMarginSetting());
pageMarginSettingPane.populate(noClientPrintAttr.getMargin()); pageMarginSettingPane.populate(noClientPrintAttr.getMargin());
} }
public void update(NoClientPrintAttr noClientPrintAttr) { public void update(NoClientPrintAttr noClientPrintAttr) {
noClientPrintAttr.setSetMarginOnPrint(setMarginWhenPrintCheck.isSelected()); noClientPrintAttr.setSetMarginOnPrint(setMarginWhenPrintCheck.isSelected());
noClientPrintAttr.setIeQuietPrint(ieQuietPrintCheck.isSelected());
noClientPrintAttr.setInheritPageMarginSetting(inheritPageMarginSettingCheck.isSelected()); noClientPrintAttr.setInheritPageMarginSetting(inheritPageMarginSettingCheck.isSelected());
noClientPrintAttr.setMargin(pageMarginSettingPane.updateBean()); noClientPrintAttr.setMargin(pageMarginSettingPane.updateBean());
} }

3
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.general.ComparatorUtils;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.ModuleContext; import com.fr.module.ModuleContext;
import com.fr.runtime.FineRuntime;
import com.fr.stable.BuildContext; import com.fr.stable.BuildContext;
import com.fr.stable.OperatingSystem; import com.fr.stable.OperatingSystem;
import com.fr.stable.ProductConstants; import com.fr.stable.ProductConstants;
@ -94,6 +95,8 @@ public class Designer extends BaseDesigner {
*/ */
public static void main(String[] args) { public static void main(String[] args) {
//启动运行时
FineRuntime.start();
BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); BuildContext.setBuildFilePath("/com/fr/stable/build.properties");

Loading…
Cancel
Save