Merge branch 'feature/9.0' of http://cloud.finedevelop.com:2015/scm/~plough/design into feature/9.0

designer_base/src/com/fr/design/icon/IconPathConstants.java

@@ -1 +1,36 @@
-package com.fr.design.icon;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 6.5.6
 * Date: 12-12-18
 * Time: 上午9:42
 * 用于保存所有图标路径的类
 */
public class IconPathConstants {
    private IconPathConstants() {

    }

    public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";

    public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png";
    public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
    public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png";
    public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png";
    public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png";
    public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
    public static final String DS_QUERY_ICON_PATH = "/com/fr/design/images/data/database.png";
    public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
    public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
    public static final String TD_EL_SHARE_HELP_ICON_PATH = "/com/fr/design/images/control/help_open.png";
    public static final String TD_EL_SHARE_CLOSE_ICON_PATH = "/com/fr/design/images/control/help_close.png";
    public static final String TD_REMOVE_ICON_PATH = "/com/fr/design/images/control/tab/remove.png";
    public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
    public static final String SP_SHOW_ICON_PATH = "/com/fr/design/images/data/store_procedure.png";
    public static final String STD_SHOW_ICON_PATH = "/com/fr/design/images/data/dock/serverdatabase.png";
    public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
    public static final String FORBID_ICON_PATH = "/com/fr/web/images/form/forbid.png";
}
+package com.fr.design.icon;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Author : Richer
+ * Version: 6.5.6
+ * Date: 12-12-18
+ * Time: 上午9:42
+ * 用于保存所有图标路径的类
+ */
+public class IconPathConstants {
+    private IconPathConstants() {
+
+    }
+
+    public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";
+
+    public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png";
+    public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
+    public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png";
+    public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png";
+    public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png";
+    public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
+    public static final String DS_QUERY_ICON_PATH = "/com/fr/design/images/data/database.png";
+    public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
+    public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
+    public static final String TD_EL_SHARE_HELP_ICON_PATH = "/com/fr/design/images/control/help_open.png";
+    public static final String TD_EL_SHARE_CLOSE_ICON_PATH = "/com/fr/design/images/control/help_close.png";
+    public static final String TD_REMOVE_ICON_PATH = "/com/fr/design/images/control/tab/remove.png";
+    public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
+    public static final String SP_SHOW_ICON_PATH = "/com/fr/design/images/data/store_procedure.png";
+    public static final String STD_SHOW_ICON_PATH = "/com/fr/design/images/data/dock/serverdatabase.png";
+    public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
+    public static final String FORBID_ICON_PATH = "/com/fr/web/images/form/forbid.png";
+    public static final String EDIT_ICON_PATH = "/com/fr/design/images/control/newEdit.png";
+}

designer_form/src/com/fr/design/designer/creator/XChartEditor.java

@@ -38,6 +38,7 @@ import com.fr.stable.core.PropertyChangeAdapter;
  */
 public class XChartEditor extends XBorderStyleWidgetCreator {
 	private static final long serialVersionUID = -7009439442104836657L;
+	private static final int BORDER_WIDTH = 2;
 	//具体来说是DesignerEditor<SimpleChartComponent>
 	private DesignerEditor<JComponent> designerEditor;
 	//	private DesignerEditor<SimpleChartComponent> designerEditor;
@@ -45,6 +46,8 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
 	private boolean isRefreshing = false;
 
 	private boolean isEditing = false;
+
+	private boolean isHovering = false;
 	private JPanel coverPanel;
 	private static final Color OUTER_BORDER_COLOR = new Color(65, 155, 249, 30);
 	private static final Color INNER_BORDER_COLOR = new Color(65, 155, 249);
@@ -135,12 +138,13 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
 	public void paintBorder(Graphics g, Rectangle bounds){
 		if(isEditing){
 			g.setColor(OUTER_BORDER_COLOR);
-			GraphHelper.draw(g, new Rectangle(bounds.x - 3, bounds.y - 3, bounds.width + 5, bounds.height + 5), Constants.LINE_LARGE);
-			g.setColor(INNER_BORDER_COLOR);
-			GraphHelper.draw(g, new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height), Constants.LINE_MEDIUM);
+			GraphHelper.draw(g, new Rectangle(bounds.x - BORDER_WIDTH, bounds.y - BORDER_WIDTH, bounds.width + BORDER_WIDTH + 1, bounds.height + BORDER_WIDTH + 1), Constants.LINE_LARGE);
+		}else if(!isHovering){
+			super.paintBorder(g, bounds);
 		}
 	}
 
+
 	/**
 	 * 返回设计器的Editor
 	 */
@@ -209,6 +213,10 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
 	public void paint(Graphics g) {
 		designerEditor.paintEditor(g, this.getSize());
 		super.paint(g);
+		if(isEditing){
+			g.setColor(INNER_BORDER_COLOR);
+			GraphHelper.draw(g, new Rectangle(0, 0, getWidth(), getHeight()), Constants.LINE_MEDIUM);
+		}
 	}
 
 	/**
@@ -283,6 +291,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
 	 * @param display     是否
 	 */
 	public void  displayCoverPane(boolean display){
+		isHovering = display;
 		coverPanel.setVisible(display);
 		coverPanel.setPreferredSize(editor.getPreferredSize());
 		coverPanel.setBounds(editor.getBounds());

designer_form/src/com/fr/design/designer/creator/XElementCase.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.GraphHelper;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.properties.mobile.ElementCasePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
@@ -20,6 +21,7 @@ import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.ElementCaseEditorProvider;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.core.PropertyChangeAdapter;
 import com.fr.stable.fun.FitProvider;
@@ -38,6 +40,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	private CoverReportPane coverPanel;
 	private FormDesigner designer;
 	private static BufferedImage DEFAULT_BACKGROUND;
+	private boolean isHovering = false;
 
 	static{
 		try{
@@ -216,11 +219,20 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	 * @param display     是否
 	 */
 	public void  displayCoverPane(boolean display){
+		isHovering = display;
 		coverPanel.setVisible(display);
 		coverPanel.setBounds(1, 1, (int) editor.getBounds().getWidth(), (int) editor.getBounds().getHeight());
 		editor.repaint();
 	}
 
+	@Override
+	public void paintBorder(Graphics g, Rectangle bounds){
+		if (!isHovering) {
+			super.paintBorder(g, bounds);
+		}
+	}
+
+
 	/**
 	 * 销毁帮助提示框
 	 */

designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java

@@ -47,6 +47,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     private int minHeight = WLayout.MIN_HEIGHT;
     private static final Color OUTER_BORDER_COLOR = new Color(65, 155, 249, 30);
     private static final Color INNER_BORDER_COLOR = new Color(65, 155, 249);
+    private static final int BORDER_WIDTH = 1;
 
     //由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
     protected double containerPercent = 1.0;
@@ -445,7 +446,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             g2d.setColor(new Color(176, 196, 222));
             g2d.fillRect((x + w / 2 - EDIT_BTN_WIDTH / 2), (y + h / 2 - EDIT_BTN_HEIGHT / 2), EDIT_BTN_WIDTH, EDIT_BTN_HEIGHT);
             //画编辑按钮图标
-            BufferedImage image = IOUtils.readImage(IconPathConstants.TD_EDIT_ICON_PATH);
+            BufferedImage image = IOUtils.readImage(IconPathConstants.EDIT_ICON_PATH);
             g2d.drawImage(
                     image,
                     (x + w / 2 - 23),
@@ -459,7 +460,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             //画编辑文字
             g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
             g.setColor(XCreatorConstants.FORM_BORDER_COLOR);
-            GraphHelper.draw(g, new Rectangle(0, 0, getWidth(), getHeight()), Constants.LINE_MEDIUM);
+            GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM);
         }
 
     }
@@ -471,6 +472,8 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             GraphHelper.draw(g, new Rectangle(bounds.x - 3, bounds.y - 3, bounds.width + 5, bounds.height + 5), Constants.LINE_LARGE);
             g.setColor(INNER_BORDER_COLOR);
             GraphHelper.draw(g, new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height), Constants.LINE_MEDIUM);
+        }else if(!isMouseEnter){
+            super.paintBorder(g, bounds);
         }
     }
     /**

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -57,6 +57,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 
 	private static final int EDIT_BTN_WIDTH = 60;
 	private static final int EDIT_BTN_HEIGHT = 24;
+	private static final int BORDER_WIDTH = 1;
 
 	private final int CARDMAINLAYOUT_CHILD_COUNT = 1;
 
@@ -298,7 +299,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 			g2d.setColor(new Color(176, 196, 222));
 			g2d.fillRect((x + w / 2 - EDIT_BTN_WIDTH / 2), (y + h / 2 - EDIT_BTN_HEIGHT / 2), EDIT_BTN_WIDTH, EDIT_BTN_HEIGHT);
 			//画编辑按钮图标
-			BufferedImage image = IOUtils.readImage(IconPathConstants.TD_EDIT_ICON_PATH);
+			BufferedImage image = IOUtils.readImage(IconPathConstants.EDIT_ICON_PATH);
 			g2d.drawImage(
 					image,
 					(x + w / 2 - 23),
@@ -312,7 +313,14 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 			//画编辑文字
 			g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
 			g.setColor(XCreatorConstants.FORM_BORDER_COLOR);
-			GraphHelper.draw(g, new Rectangle(0, 0, getWidth(), getHeight()), Constants.LINE_MEDIUM);
+			GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM);
+		}
+	}
+
+	@Override
+	public void paintBorder(Graphics g, Rectangle bounds){
+		if (!isMouseEnter) {
+			super.paintBorder(g, bounds);
 		}
 	}
 

designer_form/src/com/fr/design/mainframe/CoverPane.java

@@ -30,7 +30,7 @@ public class CoverPane extends JPanel {
         setBackground(null);
         setOpaque(false);
 
-        editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)) {
+        editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) {
             @Override
             public Dimension getPreferredSize() {
                 return new Dimension(60, 24);

designer_form/src/com/fr/design/mainframe/CoverReportPane.java

@@ -21,7 +21,7 @@ import java.awt.event.WindowEvent;
  * Time: 11:32
  */
 public class CoverReportPane extends CoverPane implements HelpDialogHandler{
-    private static final int BORDER_WIDTH = 2;
+    private static final int BORDER_WIDTH = 1;
     private Icon controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH);
     private JComponent controlButton = new JComponent() {
         protected void paintComponent(Graphics g) {
@@ -129,7 +129,7 @@ public class CoverReportPane extends CoverPane implements HelpDialogHandler{
 
     @Override
     protected Rectangle getPaintBorderBounds(){
-        return new Rectangle(BORDER_WIDTH - 1, BORDER_WIDTH- 1, getWidth() - BORDER_WIDTH * 2 , getHeight() - BORDER_WIDTH * 2);
+        return new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - 3 * BORDER_WIDTH , getHeight() - 3 * BORDER_WIDTH);
     }
 
     @Override