Merge pull request #136 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0

* commit '0f78972703cbf38bdc6b8ee1e80d97ad20a72805':
  无JIRA任务，修改包名
  REPORT-8608 安全性之水印交互验收问题=>表单部分
  无JIRA任务，修正patch错误

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

@@ -5,7 +5,7 @@ import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.io.BaseBook;
-import com.fr.base.iofileattr.TemplateIdAttrMark;
+import com.fr.base.iofile.attr.TemplateIdAttrMark;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;

designer-base/src/com/fr/design/report/WatermarkPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.report;
 
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.icombobox.UIComboBox;

designer-base/src/com/fr/design/report/WatermarkPreviewPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.report;
 
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.constants.UIConstants;
 import com.fr.page.WatermarkPainter;
 

designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java

@@ -4,7 +4,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.base.GraphHelper;
-import com.fr.base.iofileattr.SharableAttrMark;
+import com.fr.base.iofile.attr.SharableAttrMark;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;

designer-form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -4,7 +4,7 @@
 package com.fr.design.designer.creator.cardlayout;
 
 import com.fr.base.GraphHelper;
-import com.fr.base.iofileattr.SharableAttrMark;
+import com.fr.base.iofile.attr.SharableAttrMark;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;

designer-form/src/com/fr/design/mainframe/FormDesignerUI.java

@@ -1,14 +1,12 @@
 package com.fr.design.mainframe;
 
 import java.awt.AlphaComposite;
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
 import javax.swing.JComponent;
@@ -19,6 +17,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Utils;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
@@ -31,10 +30,11 @@ import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.page.WatermarkPainter;
+import com.fr.report.core.ReportUtils;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.Constants;
-import com.fr.stable.CoreGraphHelper;
 
 /**
  * FormDesigner的UI类，是一个有状态的UI类，它根据FormDesigner的当前状态画出
@@ -46,6 +46,7 @@ public class FormDesignerUI extends ComponentUI {
     private FormDesigner designer;
     private SelectionModel selectionModel;
     private Rectangle2D.Double back_or_selection_rect = new Rectangle2D.Double(0, 0, 0, 0);
+    private WatermarkPainter watermarkPainter;
     private float time;
 
     public FormDesignerUI() {
@@ -111,6 +112,18 @@ public class FormDesignerUI extends ComponentUI {
             // 当前正在添加的组件
             paintAddingBean(g, addingModel);
         }
+
+        paintWatermark((Graphics2D) g);
+    }
+
+    // 绘制水印
+    private void paintWatermark(Graphics2D g) {
+        WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(designer.getTarget());
+        // 不要每次都 new 一个 WatermarkPainter
+        if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) {
+            watermarkPainter = new WatermarkPainter(watermark);
+        }
+        watermarkPainter.paint(g, 0, designer.getParaHeight(), designer.getArea().getBounds());
     }
 
     private int[] getActualLine(int i) {

designer-form/src/com/fr/design/mainframe/ShareWidgetButton.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.iofileattr.SharableAttrMark;
+import com.fr.base.iofile.attr.SharableAttrMark;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.gui.ilable.UILabel;

designer-form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe.actions;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.iofileattr.MobileOnlyTemplateAttrMark;
+import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;

designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.widget.accessibles;
 
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.widget.editors.ITextComponent;

designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.widget.wrappers;
 
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.Exception.ValidationException;
 import com.fr.design.designer.properties.Decoder;
 import com.fr.design.designer.properties.Encoder;

designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java

@@ -1,7 +1,7 @@
 package com.fr.design.widget.ui.designer.layout;
 
 import com.fr.base.io.IOFile;
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;

designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -1,5 +1,7 @@
 package com.fr.design.widget.ui.designer.layout;
 
+import com.fr.base.io.IOFile;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
@@ -20,6 +22,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelectionUtils;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.widget.accessibles.AccessibleBodyWatermarkEditor;
 import com.fr.design.mainframe.widget.accessibles.AccessibleWLayoutBorderStyleEditor;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.design.widget.ui.designer.component.PaddingBoundPane;
@@ -30,8 +33,9 @@ import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
+import com.fr.report.core.ReportUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultComboBoxModel;
@@ -51,6 +55,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
     private UISpinner componentIntervel;
     private PaddingBoundPane paddingBound;
     private AccessibleWLayoutBorderStyleEditor stylePane;
+    private AccessibleBodyWatermarkEditor watermarkEditor;
 
     public FRFitLayoutDefinePane(XCreator xCreator) {
         super(xCreator);
@@ -72,9 +77,13 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
     public JPanel createAdvancePane() {
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         stylePane = new AccessibleWLayoutBorderStyleEditor();
+        watermarkEditor = new AccessibleBodyWatermarkEditor();
         paddingBound = new PaddingBoundPane();
-        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
+        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(
+                new Component[][]{
+                    new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane},
+                    new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), watermarkEditor}
+                }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         jPanel.add(paddingBound, BorderLayout.CENTER);
         jPanel.add(jp2, BorderLayout.NORTH);
@@ -135,6 +144,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         adaptComboBox.setSelectedIndex(ob.getCompState());
         componentIntervel.setValue(ob.getCompInterval());
         stylePane.setValue(ob.getBorderStyle());
+        watermarkEditor.setValue(ReportUtils.getWatermarkFromAttrMarkFile(getCurrentIOFile()));
     }
 
     private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) {
@@ -156,6 +166,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         if(borderStyle != null){
             layout.setBorderStyle(borderStyle);
         }
+        updateWatermark();
         Item item = (Item) layoutComboBox.getSelectedItem();
         Object value = item.getValue();
         int state = 0;
@@ -187,7 +198,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
                         FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{wAbsoluteBodyLayout}));
             }
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
 
         }
         //todo 验证下
@@ -203,6 +214,18 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         return layout;
     }
 
+    private void updateWatermark() {
+        WatermarkAttr watermark = (WatermarkAttr) watermarkEditor.getValue();
+        if (watermark != null) {
+            IOFile ioFile = getCurrentIOFile();
+            ioFile.addAttrMark(watermark);
+        }
+    }
+
+    private IOFile getCurrentIOFile() {
+        return WidgetPropertyPane.getInstance().getEditingFormDesigner().getTarget();
+    }
+
     private void setLayoutGap(int value) {
         int  interval = wFitLayout.getCompInterval();
         if (value != interval) {

designer-realize/src/com/fr/design/actions/report/ReportMobileAttrAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.report;
 
-import com.fr.base.iofileattr.MobileOnlyTemplateAttrMark;
+import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;

designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;

designer-realize/src/com/fr/grid/GridUI.java

@@ -10,7 +10,7 @@ import com.fr.base.PaperSize;
 import com.fr.base.Utils;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.background.ImageFileBackground;
-import com.fr.base.iofileattr.WatermarkAttr;
+import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.DesignerContext;
@@ -22,8 +22,8 @@ import com.fr.general.ComparatorUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
+import com.fr.main.FineBook;
 import com.fr.page.PaperSettingProvider;
-import com.fr.page.ReportPage;
 import com.fr.page.ReportSettingsProvider;
 import com.fr.page.WatermarkPainter;
 import com.fr.report.ReportHelper;
@@ -98,6 +98,7 @@ public class GridUI extends ComponentUI {
     protected int resolution;
 
     private boolean isAuthority = false;
+    private WatermarkPainter watermarkPainter;
 
     public GridUI(int resolution) {
         super();
@@ -162,9 +163,6 @@ public class GridUI extends ComponentUI {
             // denny: make that the background can move with scroll
             paintScrollBackground(g2d, grid, background, psetting, reportSettings);
         }
-
-        WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(((WorkSheet) elementCase).getBook());
-        new WatermarkPainter(watermark).paint(g2d, this.back_or_selection_rect.getBounds());
     }
 
     private void clearBackground(Graphics2D g2d, Grid grid) {
@@ -1095,9 +1093,25 @@ public class GridUI extends ComponentUI {
         // 画Drag格子的边框.
         this.paintDragCellBorder(g2d, grid);
 
+        // 画水印
+        if (elementCase instanceof WorkSheet) {
+            paintWatermark(g2d, ((WorkSheet) elementCase).getBook());
+        }
+
         grid.ajustEditorComponentBounds(); // refresh size
     }
 
+    // 绘制水印
+    private void paintWatermark(Graphics2D g2d, FineBook book) {
+        WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book);
+
+        // 不要每次都 new 一个 WatermarkPainter
+        if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) {
+            watermarkPainter = new WatermarkPainter(watermark);
+        }
+        watermarkPainter.paint(g2d, gridSize.width, gridSize.height);
+    }
+
 
     private void dealWithSizeBeforePaint(Grid grid, TemplateElementCase elementCase) {
         // 取出所有的行高和列宽的List