Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kunsnat/design into dev

designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java

@@ -279,23 +279,26 @@ public class BBSLoginDialog extends UIDialog {
      * @return 同上
      */
     public static boolean login(String username, String password) {
-        try {
+        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) {
-            username = URLEncoder.encode(username, EncodeConstants.ENCODING_GBK);
-        } catch (UnsupportedEncodingException e) {
-            FRLogger.getLogger().error(e.getMessage());
-        }
-        String url = SiteCenter.getInstance().acquireUrlByKind("bbs.login") + "&username=" + username + "&password=" + password;
-        HttpClient client = new HttpClient(url);
-        client.setTimeout(TIME_OUT);
-        if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) {
             try {
-                String res = client.getResponseText(EncodeConstants.ENCODING_GBK);
+                username = URLEncoder.encode(username, EncodeConstants.ENCODING_GBK);
-                if (res.contains(LOGIN_SUCCESS_FLAG)) {
+                password = URLEncoder.encode(password, EncodeConstants.ENCODING_GBK);
-                    return true;
+            } catch (UnsupportedEncodingException e) {
-                }
-            } catch (Exception e) {
                 FRLogger.getLogger().error(e.getMessage());
             }
+            String url = SiteCenter.getInstance().acquireUrlByKind("bbs.login") + "&username=" + username + "&password=" + password;
+            HttpClient client = new HttpClient(url);
+            client.setTimeout(TIME_OUT);
+            if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) {
+                try {
+                    String res = client.getResponseText(EncodeConstants.ENCODING_GBK);
+                    if (res.contains(LOGIN_SUCCESS_FLAG)) {
+                        return true;
+                    }
+                } catch (Exception e) {
+                    FRLogger.getLogger().error(e.getMessage());
+                }
+            }
         }
         return false;
     }

designer/src/com/fr/design/module/DesignerModule.java

@@ -14,15 +14,8 @@ import com.fr.design.actions.insert.flot.ImageFloatAction;
 import com.fr.design.actions.insert.flot.TextBoxFloatAction;
 import com.fr.design.actions.server.StyleListAction;
 import com.fr.design.fun.ElementUIProvider;
-import com.fr.design.gui.controlpane.NameObjectCreator;
-import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.hyperlink.ReportletHyperlinkPane;
-import com.fr.design.hyperlink.WebHyperlinkPane;
-import com.fr.design.javascript.EmailPane;
-import com.fr.design.javascript.JavaScriptImplPane;
-import com.fr.design.javascript.ParameterJavaScriptPane;
 import com.fr.design.javascript.ProcessTransitionAdapter;
 import com.fr.design.mainframe.*;
 import com.fr.design.mainframe.bbs.BBSGuestPane;
@@ -38,7 +31,6 @@ import com.fr.general.*;
 import com.fr.general.xml.GeneralXMLTools;
 import com.fr.io.importer.Excel2007ReportImporter;
 import com.fr.io.importer.ExcelReportImporter;
-import com.fr.js.*;
 import com.fr.main.impl.WorkBook;
 import com.fr.plugin.ExtraClassManager;
 import com.fr.quickeditor.ChartQuickEditor;
@@ -55,10 +47,11 @@ import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.fun.LogProvider;
-import com.fr.stable.module.Module;
 import com.fr.stable.plugin.PluginSimplify;
 import com.fr.stable.script.CalculatorProviderContext;
 import com.fr.stable.script.ValueConverter;
+import com.fr.stable.web.ServletContext;
+import com.fr.stable.web.ServletContextAdapter;
 import com.fr.stable.xml.ObjectTokenizer;
 import com.fr.stable.xml.ObjectXMLWriterFinder;
 import com.fr.start.BBSGuestPaneProvider;
@@ -75,6 +68,15 @@ import java.util.Set;
 
 public class DesignerModule extends DesignModule {
 
+    static {
+        ServletContext.addServletContextListener(new ServletContextAdapter() {
+
+            public void onServletStart() {
+                ModuleContext.startModule(DesignerModule.class.getName());
+            }
+        });
+    }
+
     /**
      * 启动设计器模块
      */

designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@@ -1,17 +1,23 @@
 package com.fr.design.report.freeze;
 
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import javax.swing.BorderFactory;
+import javax.swing.*;
-import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.extra.PluginManagerPane;
+import com.fr.design.extra.PluginShopDialog;
+import com.fr.design.extra.PluginWebBridge;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.Inter;
 import com.fr.page.ReportPageAttrProvider;
 import com.fr.stable.ColumnRow;
@@ -22,6 +28,10 @@ import com.fr.stable.bridge.StableFactory;
  * Sets Report Page Attributes
  */
 public class RepeatAndFreezeSettingPane extends BasicPane {
+
+	//边框高度
+	private static final int LABEL_HEIGHT = 45;
+
 	// 重复标题行
 	private RepeatRowPane repeatTitleRowPane;
 	// 重复标题列
@@ -206,7 +216,15 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
 		JPanel repeatPanel = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
 		repeatPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
 		JPanel freezePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
+		//自适应插件
+		JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Attention"));
+
+		BoxCenterAligmentPane actionLabel = getURLActionLabel(Inter.getLocText("FR-Designer_Form-Fit-Tip"));
+		infoPane.add(actionLabel, BorderLayout.SOUTH);
+
 		outfreezePanel.add(freezePanel);
+		this.add(infoPane, BorderLayout.SOUTH);
 		// 重复打印部分
 		// 重复打印标题的起始行
 		JPanel labelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@@ -536,4 +554,58 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
 		return null;
 	}
 
+	private BoxCenterAligmentPane getURLActionLabel(final String text) {
+		ActionLabel actionLabel = new ActionLabel(text);
+
+		actionLabel.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				try {
+					//Desktop.getDesktop().browse(new URI(url));
+					final PluginManagerPane managerPane = new PluginManagerPane();
+					UIDialog dlg = new PluginShopDialog(DesignerContext.getDesignerFrame(),managerPane);
+					PluginWebBridge.getHelper().setDialogHandle(dlg);
+					dlg.setVisible(true);
+					RepeatAndFreezeSettingPane.this.getTopLevelAncestor().setVisible(false);
+				} catch (Exception exp) {
+
+				}
+			}
+		});
+
+		return new BoxCenterAligmentPane(actionLabel);
+	}
+
+	class BoxCenterAligmentPane extends JPanel {
+
+		private UILabel textLabel;
+
+		public BoxCenterAligmentPane(String text) {
+			this(new UILabel(text));
+		}
+
+		public BoxCenterAligmentPane(UILabel label) {
+			this.setLayout(FRGUIPaneFactory.createBorderLayout());
+
+			JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+			this.add(centerPane, BorderLayout.CENTER);
+			UILabel label1 = new UILabel(Inter.getLocText("FR-Designer_Form-Frozen-Tip"));
+			label1.setForeground(new Color(255, 0, 0));
+			UILabel label2 = new UILabel(Inter.getLocText("FR-Designer_Form-Forzen-Speed"));
+			label2.setForeground(new Color(255, 0, 0));
+			this.textLabel = label;
+			centerPane.add(label1);
+			centerPane.add(textLabel);
+			centerPane.add(label2);
+		}
+
+		public void setFont(Font font) {
+			super.setFont(font);
+
+			if (textLabel != null) {
+				textLabel.setFont(font);
+			}
+		}
+	}
+
 }

designer/src/com/fr/design/webattr/EditToolBar.java

@@ -63,16 +63,8 @@ public class EditToolBar extends BasicPane {
 
 	private ListSelectionListener listSelectionListener = new ListSelectionListener() {
 		public void valueChanged(ListSelectionEvent evt) {
-			if (lastButton != null && lastButton.getWidget() instanceof Button) {
+			if (lastButton != null) {
-				if (!((list.getSelectedValue() instanceof ToolBarButton)
+				lastButton.setWidget(bp.update());
-						&& ((ToolBarButton)(list.getSelectedValue())).getWidget() instanceof CustomToolBarButton)) {
-					lastButton.setWidget(bp.update());
-				} else {
-					((Button) lastButton.getWidget()).setShowIcon(bp.icon.isSelected());
-					((Button) lastButton.getWidget()).setShowText(bp.text.isSelected());
-					((Button) lastButton.getWidget()).setText(bp.nameField.getText());
-					((Button) lastButton.getWidget()).setIconName(bp.iconPane.update());
-				}
 			}
 			if (list.getSelectedValue() instanceof ToolBarButton) {
 				lastButton = (ToolBarButton) list.getSelectedValue();

designer/src/com/fr/design/widget/CellWidgetCardPane.java

@@ -86,7 +86,12 @@ public class CellWidgetCardPane extends BasicPane {
 
         attriPane.remove(widgetPropertyPane);
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        attriPane.add(widgetPropertyPane, BorderLayout.NORTH);
+        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        northPane.setBorder(BorderFactory.createEmptyBorder(10, 8, 5, 8));
+        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Form-Basic_Properties"));
+        northPane.add(basic);
+        basic.add(widgetPropertyPane);
+        attriPane.add(northPane, BorderLayout.NORTH);
 
         WidgetDefinePaneFactory.RN rn = WidgetDefinePaneFactory.createWidgetDefinePane(cellWidget, new Operator() {
             @Override

designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java

@@ -6,107 +6,138 @@ import java.awt.event.ItemListener;
 
 import javax.swing.BorderFactory;
 
-import com.fr.design.gui.frpane.TreeSettingPane;
 import com.fr.design.gui.ilable.UILabel;
+
 import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.present.dict.DictionaryPane;
 import com.fr.form.ui.FieldEditor;
 import com.fr.general.Inter;
-import com.fr.design.widget.DataModify;
 
 public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
-	private UICheckBox allowBlankCheckBox;
+    private UICheckBox allowBlankCheckBox;
-	// richer:错误信息，是所有控件共有的属性，所以放到这里来
+    // richer:错误信息，是所有控件共有的属性，所以放到这里来
-	private UITextField errorMsgTextField;
+    private UITextField errorMsgTextField;
-
+    private UITextField regErrorMsgTextField;
-	public FieldEditorDefinePane() {
+
-		this.initComponents();
+    public FieldEditorDefinePane() {
-	}
+        this.initComponents();
-
+    }
-	protected void initComponents() {
+
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
+    protected void initComponents() {
-		JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		this.add(northPane, BorderLayout.NORTH);
+        regErrorMsgTextField = new UITextField(16);
-		JPanel firstPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        regErrorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
-		firstPanel.setBorder(BorderFactory.createEmptyBorder(0, -2, 0, 0));
+            public void changedUpdate(DocumentEvent e) {
-		//JPanel firstPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
+                regErrorMsgTextField.setToolTipText(regErrorMsgTextField.getText());
-		allowBlankCheckBox = new UICheckBox(Inter.getLocText("Allow_Blank"));
+            }
-		// 是否允许为空
+
-		firstPanel.add(allowBlankCheckBox);
+            public void insertUpdate(DocumentEvent e) {
-		allowBlankCheckBox.addItemListener(new ItemListener() {
+                regErrorMsgTextField.setToolTipText(regErrorMsgTextField.getText());
-			
+            }
-			@Override
+
-			public void itemStateChanged(ItemEvent e) {
+            public void removeUpdate(DocumentEvent e) {
-				errorMsgTextField.setEnabled(!allowBlankCheckBox.isSelected());
+                regErrorMsgTextField.setToolTipText(regErrorMsgTextField.getText());
-			}
+            }
-		});
+        });
-
+
-		// 错误信息
+        //JPanel firstPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
-		JPanel errorMsgPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+        allowBlankCheckBox = new UICheckBox(Inter.getLocText("Allow_Blank"));
-		firstPanel.add(errorMsgPane);
+
-		northPane.add(firstPanel);
+        allowBlankCheckBox.addItemListener(new ItemListener() {
-		errorMsgPane.add(new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"));
+
-		errorMsgTextField = new UITextField(16);
+            @Override
-		errorMsgPane.add(errorMsgTextField);
+            public void itemStateChanged(ItemEvent e) {
-
+                errorMsgTextField.setEnabled(!allowBlankCheckBox.isSelected());
-		// richer:主要为了方便查看比较长的错误信息
+            }
-		errorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
+        });
-
+
-			public void changedUpdate(DocumentEvent e) {
+        // 错误信息
-				errorMsgTextField.setToolTipText(errorMsgTextField.getText());
+        JPanel errorMsgPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-			}
+        //目前只整改了文本、密码、文本域和数字四个控件
-
+        this.addAllowBlankPane(allowBlankCheckBox, errorMsgPane);
-			public void insertUpdate(DocumentEvent e) {
+        errorMsgPane.add(new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"));
-				errorMsgTextField.setToolTipText(errorMsgTextField.getText());
+        errorMsgTextField = new UITextField(16);
-			}
+        errorMsgPane.add(errorMsgTextField);
-
+
-			public void removeUpdate(DocumentEvent e) {
+        // richer:主要为了方便查看比较长的错误信息
-				errorMsgTextField.setToolTipText(errorMsgTextField.getText());
+        errorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
-			}
+
-		});
+            public void changedUpdate(DocumentEvent e) {
-		JPanel contentPane = this.setFirstContentPane();
+                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-		if (contentPane != null) {
+            }
-			//contentPane.add(firstPanel);
+
-			this.add(contentPane, BorderLayout.CENTER);
+            public void insertUpdate(DocumentEvent e) {
-		} else {
+                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-			//this.add(firstPanel, BorderLayout.CENTER);
+            }
-		}
+
-	}
+            public void removeUpdate(DocumentEvent e) {
-
+                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-	@Override
+            }
-	public void populateBean(T ob) {
+        });
-		this.allowBlankCheckBox.setSelected(ob.isAllowBlank());
+        JPanel contentPane = this.setFirstContentPane();
-		errorMsgTextField.setEnabled(!allowBlankCheckBox.isSelected());
+        if (contentPane != null) {
-		this.errorMsgTextField.setText(ob.getErrorMessage());
+            //contentPane.add(firstPanel);
-
+            this.add(contentPane, BorderLayout.CENTER);
-		populateSubFieldEditorBean(ob);
+        } else {
-	}
+            //this.add(firstPanel, BorderLayout.CENTER);
-
+        }
-	protected abstract void populateSubFieldEditorBean(T ob);
+    }
-
+
-	@Override
+    @Override
-	public T updateBean() {
+    public void populateBean(T ob) {
-		T e = updateSubFieldEditorBean();
+        this.allowBlankCheckBox.setSelected(ob.isAllowBlank());
-
+        errorMsgTextField.setEnabled(!allowBlankCheckBox.isSelected());
-		e.setAllowBlank(this.allowBlankCheckBox.isSelected());
+        this.errorMsgTextField.setText(ob.getErrorMessage());
-		e.setErrorMessage(this.errorMsgTextField.getText());
+
-
+        populateSubFieldEditorBean(ob);
-		return e;
+    }
-	}
+
-
+    protected abstract void populateSubFieldEditorBean(T ob);
-	protected abstract T updateSubFieldEditorBean();
+
-
+    @Override
-	protected abstract JPanel setFirstContentPane();
+    public T updateBean() {
-
+        T e = updateSubFieldEditorBean();
-	@Override
+
-	public void checkValid() throws Exception {
+        e.setAllowBlank(this.allowBlankCheckBox.isSelected());
-
+        e.setErrorMessage(this.errorMsgTextField.getText());
-	}
+
+        return e;
+    }
+
+    protected abstract T updateSubFieldEditorBean();
+
+    protected abstract JPanel setFirstContentPane();
+
+    @Override
+    public void checkValid() throws Exception {
+
+    }
+
+    public void addAllowBlankPane(UICheckBox allowBlankCheckBox, JPanel errorMsgPane) {
+        JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        this.add(northPane, BorderLayout.NORTH);
+        JPanel firstPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        firstPanel.setBorder(BorderFactory.createEmptyBorder(0, -2, 0, 0));
+        firstPanel.add(allowBlankCheckBox);
+        firstPanel.add(errorMsgPane);
+        northPane.add(firstPanel);
+    }
+
+    public UICheckBox getAllowBlankCheckBox() {
+        return allowBlankCheckBox;
+    }
+
+    public UITextField getErrorMsgTextField() {
+        return errorMsgTextField;
+    }
+
+    public UITextField getRegErrorMsgTextField() {
+        return regErrorMsgTextField;
+    }
+
 }

designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@@ -121,9 +121,9 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         @Override
         public void stateChanged(ChangeEvent e) {
             if (setMaxValueCheckBox.isSelected()) {
-				if (setMinValueCheckBox.isSelected()) {
+                if (setMinValueCheckBox.isSelected()) {
-                	minValueModel.setMaximum(Double.parseDouble("" + maxValueSpinner.getValue()));
+                    minValueModel.setMaximum(Double.parseDouble("" + maxValueSpinner.getValue()));
-				}
+                }
             }
         }
     };
@@ -133,9 +133,9 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         @Override
         public void stateChanged(ChangeEvent e) {
             if (setMinValueCheckBox.isSelected()) {
-				if (setMaxValueCheckBox.isSelected()) {
+                if (setMaxValueCheckBox.isSelected()) {
-                	maxValueModel.setMinimum(Double.parseDouble("" + minValueSpinner.getValue()));
+                    maxValueModel.setMinimum(Double.parseDouble("" + minValueSpinner.getValue()));
-				}
+                }
             }
         }
     };
@@ -153,26 +153,34 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     @Override
     protected JPanel setFirstContentPane() {
         JPanel content = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        content.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
+        content.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
         content.setLayout(FRGUIPaneFactory.createBorderLayout());
         // richer:数字的允许直接编辑没有意义
 
-        JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
         content.add(northPane, BorderLayout.NORTH);
 
         waterMarkDictPane = new WaterMarkDictPane();
         northPane.add(waterMarkDictPane);
+        JPanel centerPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Validate"));
+        JPanel validatePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        validatePane.setPreferredSize(new Dimension(400, 200));
+        centerPane.add(validatePane);
+        content.add(northPane, BorderLayout.NORTH);
+        content.add(centerPane, BorderLayout.CENTER);
+        validatePane.add(GUICoreUtils.createFlowPane(getAllowBlankCheckBox(), FlowLayout.LEFT));
+        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getErrorMsgTextField()}, FlowLayout.LEFT, 24));
 
         this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
         this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
         this.decimalLength.setColumns(4);
         limitNumberPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Double", "Numbers"}) + ":"), this.decimalLength},
                 FlowLayout.LEFT, 4);
-        northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowDecimalsCheckBox, limitNumberPane}, FlowLayout.LEFT, 4));
+        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowDecimalsCheckBox, limitNumberPane}, FlowLayout.LEFT, 4));
         this.allowDecimalsCheckBox.addActionListener(actionListener1);
 
         this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative"));
-        northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowNegativeCheckBox}, FlowLayout.LEFT, 4));
+        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowNegativeCheckBox}, FlowLayout.LEFT, 4));
         this.allowNegativeCheckBox.addActionListener(actionListener2);
 
         this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false);
@@ -180,7 +188,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.maxValueSpinner = new UIBasicSpinner(maxValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
         maxValueSpinner.setPreferredSize(new Dimension(120, 20));
         setNotAllowsInvalid(this.maxValueSpinner);
-        northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMaxValueCheckBox, this.maxValueSpinner}, FlowLayout.LEFT, 4));
+        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMaxValueCheckBox, this.maxValueSpinner}, FlowLayout.LEFT, 4));
         this.maxValueSpinner.setVisible(false);
         this.setMaxValueCheckBox.addActionListener(actionListener3);
         this.maxValueSpinner.addChangeListener(changeListener1);
@@ -189,10 +197,12 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.minValueSpinner = new UIBasicSpinner(minValueModel = new SpinnerNumberModel(0D, -Double.MAX_VALUE, Double.MAX_VALUE, 1D));
         minValueSpinner.setPreferredSize(new Dimension(120, 20));
         setNotAllowsInvalid(this.minValueSpinner);
-        northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMinValueCheckBox, this.minValueSpinner}, FlowLayout.LEFT, 4));
+        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{this.setMinValueCheckBox, this.minValueSpinner}, FlowLayout.LEFT, 4));
         this.minValueSpinner.setVisible(false);
         this.setMinValueCheckBox.addActionListener(actionListener4);
         this.minValueSpinner.addChangeListener(changeListener2);
+        validatePane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
+
         return content;
     }
 
@@ -227,7 +237,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
             minValueSpinner.setVisible(true);
             minValueSpinner.setValue(new Double(e.getMinValue()));
         }
-
+        this.getRegErrorMsgTextField().setText(e.getRegErrorMessage());
         this.waterMarkDictPane.populate(e);
     }
 
@@ -255,6 +265,8 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
 
         this.waterMarkDictPane.update(ob);
 
+        ob.setRegErrorMessage(this.getRegErrorMsgTextField().getText());
+
         return ob;
     }
 
@@ -283,4 +295,8 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         }
     }
 
+    @Override
+    public void addAllowBlankPane(UICheckBox allowBlankCheckBox, JPanel errorMsgPane) {
+    }
+
 }

designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java

@@ -1,91 +1,124 @@
 package com.fr.design.widget.ui;
 
 import com.fr.design.gui.frpane.RegPane;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.reg.RegExp;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
 public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor> {
-	protected RegPane regPane;
+    protected RegPane regPane;
-	private WaterMarkDictPane waterMarkDictPane;
+    private WaterMarkDictPane waterMarkDictPane;
-
+
-	public TextFieldEditorDefinePane() {
+    public TextFieldEditorDefinePane() {
-		this.initComponents();
+        this.initComponents();
-	}
+    }
-
+
-	@Override
+    @Override
-	protected JPanel setFirstContentPane() {
+    protected JPanel setFirstContentPane() {
-		JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
+        attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
-		JPanel contenter = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel contenter = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		contenter.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
+        contenter.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
-		attrPane.add(contenter, BorderLayout.NORTH);
+        attrPane.add(contenter);
-		regPane = createRegPane();
+        regPane = createRegPane();
-		final RegPane.RegChangeListener rl = new RegPane.RegChangeListener() {
+        final RegPane.RegChangeListener rl = new RegPane.RegChangeListener() {
-
+
-			@Override
+            @Override
-			public void regChangeAction() {
+            public void regChangeAction() {
-				waterMarkDictPane.setWaterMark("");
+                waterMarkDictPane.setWaterMark("");
-				regPane.removeRegChangeListener(this);
+                regPane.removeRegChangeListener(this);
-			}
+            }
-		};
+        };
-		final RegPane.PhoneRegListener pl = new RegPane.PhoneRegListener() {
+        final RegPane.PhoneRegListener pl = new RegPane.PhoneRegListener() {
-			public void phoneRegChangeAction(RegPane.PhoneRegEvent e) {
+            public void phoneRegChangeAction(RegPane.PhoneRegEvent e) {
-				if (StringUtils.isNotEmpty(e.getPhoneRegString())
+                if (StringUtils.isNotEmpty(e.getPhoneRegString())
-						&& StringUtils.isEmpty(waterMarkDictPane.getWaterMark())) {
+                        && StringUtils.isEmpty(waterMarkDictPane.getWaterMark())) {
-					waterMarkDictPane.setWaterMark(Inter.getLocText("Example") + ":" + e.getPhoneRegString());
+                    waterMarkDictPane.setWaterMark(Inter.getLocText("Example") + ":" + e.getPhoneRegString());
-					regPane.addRegChangeListener(rl);
+                    regPane.addRegChangeListener(rl);
-				}
+                }
-			}
+            }
-		};
+        };
-		regPane.addPhoneRegListener(pl);
+        regPane.addPhoneRegListener(pl);
-
+        JPanel basicPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Validate"));
-		waterMarkDictPane = new WaterMarkDictPane();
+        JPanel validateContent = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-		waterMarkDictPane.addInputKeyListener(new KeyAdapter() {
+        getAllowBlankCheckBox().setPreferredSize(new Dimension(444, 40));
-			public void keyTyped(KeyEvent e) {
+        validateContent.add(GUICoreUtils.createFlowPane(getAllowBlankCheckBox(), FlowLayout.LEFT));
-				regPane.removePhoneRegListener(pl);
+        validateContent.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getErrorMsgTextField()}, FlowLayout.LEFT, 24));
-				regPane.removeRegChangeListener(rl);
+        validateContent.add(GUICoreUtils.createFlowPane(regPane, FlowLayout.LEFT));
-				waterMarkDictPane.removeInputKeyListener(this);
+        validateContent.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
-			}
+        basicPane.add(validateContent);
-		});
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
-		contenter.add(regPane, BorderLayout.NORTH);
+        waterMarkDictPane = new WaterMarkDictPane();
-		contenter.add(waterMarkDictPane, BorderLayout.CENTER);
+        waterMarkDictPane.addInputKeyListener(new KeyAdapter() {
-		return attrPane;
+            public void keyTyped(KeyEvent e) {
-	}
+                regPane.removePhoneRegListener(pl);
-
+                regPane.removeRegChangeListener(rl);
-	protected RegPane createRegPane() {
+                waterMarkDictPane.removeInputKeyListener(this);
-		return new RegPane();
+            }
-	}
+        });
-
+        //监听填写规则下拉框的值的变化
-	@Override
+        regPane.getRegComboBox().addActionListener(new ActionListener() {
-	protected String title4PopupWindow() {
+            public void actionPerformed(ActionEvent e) {
-		return "text";
+                RegExp regExp = (RegExp) regPane.getRegComboBox().getSelectedItem();
-	}
+                if (!StringUtils.isNotEmpty(regExp.toRegText())) {
-
+                    getRegErrorMsgTextField().setEnabled(false);
-	@Override
+                } else {
-	protected void populateSubFieldEditorBean(TextEditor e) {
+                    getRegErrorMsgTextField().setEnabled(true);
-		this.regPane.populate(e.getRegex());
+                }
-		waterMarkDictPane.populate(e);
+
-	}
+            }
-
+        });
-	@Override
+        advancedPane.add(waterMarkDictPane);
-	protected TextEditor updateSubFieldEditorBean() {
+        contenter.add(advancedPane, BorderLayout.NORTH);
-		TextEditor ob = newTextEditorInstance();
+        contenter.add(basicPane, BorderLayout.CENTER);
-
+        return attrPane;
-		ob.setRegex(this.regPane.update());
+    }
-		waterMarkDictPane.update(ob);
+
-
+    protected RegPane createRegPane() {
-		return ob;
+        return new RegPane();
-	}
+    }
-
+
-	protected TextEditor newTextEditorInstance() {
+    @Override
-		return new TextEditor();
+    protected String title4PopupWindow() {
-	}
+        return "text";
+    }
+
+    @Override
+    protected void populateSubFieldEditorBean(TextEditor e) {
+        this.regPane.populate(e.getRegex());
+        getRegErrorMsgTextField().setText(e.getRegErrorMessage());
+        waterMarkDictPane.populate(e);
+    }
+
+    @Override
+    protected TextEditor updateSubFieldEditorBean() {
+        TextEditor ob = newTextEditorInstance();
+        ob.setRegErrorMessage(this.getRegErrorMsgTextField().getText());
+        ob.setRegex(this.regPane.update());
+        waterMarkDictPane.update(ob);
+
+        return ob;
+    }
+
+    protected TextEditor newTextEditorInstance() {
+        return new TextEditor();
+    }
+
+    @Override
+    public void addAllowBlankPane(UICheckBox allowBlankCheckBox, JPanel errorMsgPane) {
+    }
+
 
 }

designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java

@@ -173,10 +173,9 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
             comboItemsMap = new HashMap<>();
 
             Set<SubmitProvider> providers = ExtraDesignClassManager.getInstance().getArray(SubmitProvider.MARK_STRING);
-            providers.add(new DefaultSubmit());
+            addSubmitPane(new DefaultSubmit());
             for (SubmitProvider provider : providers) {
-                customSubmitPanes.put(provider.keyForSubmit(), provider.appearanceForSubmit());
+                addSubmitPane(provider);
-                comboItemsMap.put(provider.keyForSubmit(), provider.dataForSubmit());
             }
 
             configTypes = new ArrayList<>();
@@ -211,6 +210,11 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
             });
         }
 
+        private void addSubmitPane(SubmitProvider provider) {
+            customSubmitPanes.put(provider.keyForSubmit(), provider.appearanceForSubmit());
+            comboItemsMap.put(provider.keyForSubmit(), provider.dataForSubmit());
+        }
+
         @Override
         public void populateBean(WClassSubmiterProvider ob) {
             editing = ob;

designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java

@@ -103,7 +103,7 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 
 		Rectangle bounds = block.getBounds().toRectangle(resolution);
 		Point resultPoint = MoveUtils.sorption(bounds.x + dragStart.x < 0 ? 0 : bounds.x + dragStart.x, bounds.y
-				+ dragStart.y < 0 ? 0 : bounds.y + dragStart.y, bounds.width, bounds.height, rectDesigner);
+				+ dragStart.y < 0 ? 0 : bounds.y + dragStart.y, bounds.width, bounds.height, rectDesigner, false);
 		block.setBounds(new UnitRectangle(new Rectangle(resultPoint.x, resultPoint.y, bounds.width, bounds.height),
 				resolution));
 		designer.repaint();
@@ -124,7 +124,17 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 		public RectangleIterator createRectangleIterator() {
 			return getRectangleIt();
 		}
-		
+
+		/**
+		 * 设置等距线
+		 *
+		 * @param line 吸附线
+		 */
+		@Override
+		public void setEquidistantLine(Absorptionline line) {
+
+		}
+
 		/**
 		 * 获取当前选中块的垂直线数组
 		 * 
@@ -145,6 +155,34 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 			return editor.getValue().getHorizontalLine();
 		}
 
+		/**
+		 * 设置designer内部组件是否重叠的标志位
+		 *
+		 * @param isIntersects 是否重叠
+		 */
+		@Override
+		public void setWidgetsIntersects(boolean isIntersects) {
+		}
+
+		/**
+		 * 获取designer内部组件是否重叠的标志位
+		 *
+		 * @return 重叠
+		 */
+		@Override
+		public boolean getWidgetsIntersects() {
+			return false;
+		}
+
+		/**
+		 * 获取designer相对屏幕的位置
+		 *
+		 * @return 位置
+		 */
+		@Override
+		public Point getDesignerLocationOnScreen() {
+			return null;
+		}
 	};
 	
 	private RectangleIterator getRectangleIt(){

designer_base/build.gradle

@@ -0,0 +1,61 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+version='8.0'
+
+jar{
+	baseName='fr-designer-core'
+}
+
+
+def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design"
+def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib"
+
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/designer_base/src"]
+			}
+		}
+}
+
+
+dependencies{
+compile fileTree(dir:'../../',include:'**/*.jar')
+compile fileTree(dir:libDir,include:'*.jar')
+compile fileTree(dir:"${libDir}/jetty",include:'*.jar')
+ 	testCompile 'junit:junit:4.12'
+}
+
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/designer_base/src"){
+			exclude '**/*.java'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//ѹËõÏîÄ¿ÖеÄjsÎļþ
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../lib',includes:'*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/designer_base/src"){
+			include (name:'**/*.js')
+
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -11,6 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.general.Inter;
+import com.fr.general.SiteCenter;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
@@ -69,6 +70,8 @@ public class AboutPane extends JPanel {
             boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
             contentPane.add(boxCenterAlignmentPane);
         }
+        boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ:" + SiteCenter.getInstance().acquireUrlByKind("help.qq"));
+        contentPane.add(boxCenterAlignmentPane);
 
         BoxCenterAligmentPane actionLabel = getURLActionLabel(ProductConstants.WEBSITE_URL);
         BoxCenterAligmentPane emailLabel = getEmailActionLabel(ProductConstants.SUPPORT_EMAIL);

designer_base/src/com/fr/design/beans/BasicBeanPane.java

@@ -6,6 +6,8 @@ import com.fr.design.dialog.BasicPane;
  * Update Pane
  */
 public abstract class BasicBeanPane<T> extends BasicPane {
+    
+
 
 	/**
 	 * Populate.

designer_base/src/com/fr/design/beans/location/Absorptionline.java

@@ -1,23 +1,43 @@
 package com.fr.design.beans.location;
 
-import java.awt.Color;
+import java.awt.*;
-import java.awt.Graphics;
 
 import com.fr.base.GraphHelper;
 import com.fr.design.scrollruler.ScrollRulerComponent;
 import com.fr.stable.ArrayUtils;
+import com.fr.third.org.hsqldb.lib.Collection;
 
 public class Absorptionline {
+	//箭头线前段为4px的等边三角形，给定了一个点的坐标，计算一下剩下两个点的坐标偏移量
+	//而且箭头分为四个朝向，故有四组坐标(2根号3 约为 3)
+	// 1.(x,y)(x+2,y±2根号3)(x-2,y±2根号3)
+	// 2.(x,y)(x±2根号3,y-2)(x±2根号3,y+2)
+	private static int RECTANGLE_OFFSET_X = 2;
+	private static int RECTANGLE_OFFSET_Y = 3;
+	private static int WIDGET_DISTANCE_MIN = 8;
+	//控件周围八个拖拽框的大小
+	private static int RESIZE_BOX_SIZE = 5;
+
 	private static Absorptionline lineInX = new Absorptionline(null, null, null, true);
 	private static Absorptionline lineInY = new Absorptionline(null, null, null, false);
 
+	private static Absorptionline lineEquidistant = new Absorptionline(null, null, null, true);
+
 	private Color lineColor = new Color(228, 225, 199);
 	private Color midLineColor = new Color(196, 227, 237);
+	private Color equidistantLineColor = new Color(0xff, 0x0d, 0x7b);
+
 	private Integer x1;
 	private Integer x2;
 	private Integer middle;
 	private int[] verticalLines;
 	private int[] horizontalLines;
+
+	private int top;
+	private int left;
+	private int bottom;
+	private int right;
+	private Rectangle equidistantStart;
 	
 	private boolean trans;
 
@@ -89,6 +109,19 @@ public class Absorptionline {
 		return lineInY;
 	}
 
+	/**
+	 * 创建等距线
+	 * @return 等距线
+	 */
+	public static Absorptionline createEquidistantAbsorptionline(Rectangle equidistantStart, int top, int left, int bottom, int right) {
+		lineEquidistant.equidistantStart = equidistantStart;
+		lineEquidistant.top = top;
+		lineEquidistant.left = left;
+		lineEquidistant.bottom = bottom;
+		lineEquidistant.right = right;
+		return lineEquidistant;
+	}
+
 	private Absorptionline(Integer x1, Integer x2, Integer middleInX, boolean trans) {
 		this.x1 = x1;
 		this.x2 = x2;
@@ -186,5 +219,175 @@ public class Absorptionline {
 			}
 
 		}
+		//画等距线
+		if (equidistantStart != null) {
+			g.setColor(equidistantLineColor);
+			if (top > 0) {
+				paintTopEquidistantLine(g);
+			}
+			if (left > 0) {
+				paintLeftEquidistantLine(g);
+			}
+			if (bottom > 0) {
+				paintBottomEquidistantLine(g);
+			}
+			if (right > 0) {
+				paintRightEquidistantLine(g);
+			}
+		}
+	}
+
+	//朝向上方的等距线
+	private void paintTopEquidistantLine(Graphics g){
+		int x[] = {
+				equidistantStart.x + equidistantStart.width / 2,
+				equidistantStart.x + equidistantStart.width / 2 - RECTANGLE_OFFSET_X,
+				equidistantStart.x + equidistantStart.width / 2 + RECTANGLE_OFFSET_X
+		};
+		int[] y1, y2;
+		if (equidistantStart.y - top > WIDGET_DISTANCE_MIN) {
+			y1 = new int[] {
+					top,
+					top + RECTANGLE_OFFSET_Y,
+					top + RECTANGLE_OFFSET_Y
+			};
+			y2 = new int[]{
+					equidistantStart.y - RESIZE_BOX_SIZE,
+					equidistantStart.y - RESIZE_BOX_SIZE - RECTANGLE_OFFSET_Y,
+					equidistantStart.y - RESIZE_BOX_SIZE - RECTANGLE_OFFSET_Y
+			};
+		}
+		else{
+			y1 = new int[] {
+					top,
+					top - RECTANGLE_OFFSET_Y,
+					top - RECTANGLE_OFFSET_Y
+			};
+			y2 = new int[] {
+					equidistantStart.y,
+					equidistantStart.y + RECTANGLE_OFFSET_Y,
+					equidistantStart.y + RECTANGLE_OFFSET_Y
+			};
+		}
+		g.fillPolygon(x, y1, 3);
+		g.fillPolygon(x, y2, 3);
+		GraphHelper.drawLine(g,
+				equidistantStart.x + equidistantStart.width / 2, top,
+				equidistantStart.x + equidistantStart.width / 2, equidistantStart.y - RESIZE_BOX_SIZE);
+	}
+	//朝向左侧的等距线
+	private void paintLeftEquidistantLine(Graphics g){
+		int y[] = {
+				equidistantStart.y + equidistantStart.height / 2,
+				equidistantStart.y + equidistantStart.height / 2 - RECTANGLE_OFFSET_X,
+				equidistantStart.y + equidistantStart.height / 2 + RECTANGLE_OFFSET_X,
+		};
+		int[] x1, x2;
+		if (equidistantStart.x - left > WIDGET_DISTANCE_MIN) {
+			x1 = new int[] {
+					left,
+					left + RECTANGLE_OFFSET_Y,
+					left + RECTANGLE_OFFSET_Y,
+			};
+
+			x2 = new int[] {
+					equidistantStart.x - RESIZE_BOX_SIZE,
+					equidistantStart.x - RESIZE_BOX_SIZE - RECTANGLE_OFFSET_Y,
+					equidistantStart.x - RESIZE_BOX_SIZE - RECTANGLE_OFFSET_Y
+			};
+		}
+		else{
+			x1 = new int[] {
+					left,
+					left - RECTANGLE_OFFSET_Y,
+					left - RECTANGLE_OFFSET_Y,
+			};
+			x2 = new int[] {
+					equidistantStart.x,
+					equidistantStart.x + RECTANGLE_OFFSET_Y,
+					equidistantStart.x + RECTANGLE_OFFSET_Y
+			};
+		}
+		g.fillPolygon(x1, y, 3);
+		g.fillPolygon(x2, y, 3);
+		GraphHelper.drawLine(g,
+				left, equidistantStart.y + equidistantStart.height / 2,
+				equidistantStart.x, equidistantStart.y + equidistantStart.height / 2);
+	}
+	//朝向下方的等距线
+	private void paintBottomEquidistantLine(Graphics g) {
+		int x[] = {
+				equidistantStart.x + equidistantStart.width / 2,
+				equidistantStart.x + equidistantStart.width / 2 + RECTANGLE_OFFSET_X,
+				equidistantStart.x + equidistantStart.width / 2 - RECTANGLE_OFFSET_X,
+		};
+		int[] y1, y2;
+		if (bottom - equidistantStart.y + equidistantStart.height > WIDGET_DISTANCE_MIN) {
+			y1 = new int[] {
+					equidistantStart.y + equidistantStart.height + RESIZE_BOX_SIZE,
+					equidistantStart.y + equidistantStart.height + RESIZE_BOX_SIZE + RECTANGLE_OFFSET_Y,
+					equidistantStart.y + equidistantStart.height + RESIZE_BOX_SIZE + RECTANGLE_OFFSET_Y,
+			};
+			y2 = new int[] {
+					bottom,
+					bottom - RECTANGLE_OFFSET_Y,
+					bottom - RECTANGLE_OFFSET_Y
+			};
+		}
+		else{
+			y1 = new int[] {
+					equidistantStart.y + equidistantStart.height,
+					equidistantStart.y + equidistantStart.height - RECTANGLE_OFFSET_Y,
+					equidistantStart.y + equidistantStart.height - RECTANGLE_OFFSET_Y,
+			};
+			y2 = new int[] {
+					bottom,
+					bottom + RECTANGLE_OFFSET_Y,
+					bottom + RECTANGLE_OFFSET_Y
+			};
+		}
+		g.fillPolygon(x, y1, 3);
+		g.fillPolygon(x, y2, 3);
+		GraphHelper.drawLine(g,
+				equidistantStart.x + equidistantStart.width / 2, equidistantStart.y + equidistantStart.height,
+				equidistantStart.x + equidistantStart.width / 2, bottom);
+	}
+	//朝向右侧的等距线
+	private void paintRightEquidistantLine(Graphics g){
+		int y[] = {
+				equidistantStart.y + equidistantStart.height / 2,
+				equidistantStart.y + equidistantStart.height / 2 - RECTANGLE_OFFSET_X,
+				equidistantStart.y + equidistantStart.height / 2 + RECTANGLE_OFFSET_X
+		};
+		int[] x1, x2;
+		if(right - equidistantStart.x > WIDGET_DISTANCE_MIN) {
+			x1 = new int[]{
+					right,
+					right - RECTANGLE_OFFSET_Y,
+					right - RECTANGLE_OFFSET_Y
+			};
+			x2 = new int[]{
+					equidistantStart.x + equidistantStart.width + RESIZE_BOX_SIZE,
+					equidistantStart.x + equidistantStart.width + RESIZE_BOX_SIZE + RECTANGLE_OFFSET_Y,
+					equidistantStart.x + equidistantStart.width + RESIZE_BOX_SIZE + RECTANGLE_OFFSET_Y
+			};
+		}
+		else{
+			x1 = new int[]{
+					right,
+					right + RECTANGLE_OFFSET_Y,
+					right + RECTANGLE_OFFSET_Y
+			};
+			x2 = new int[]{
+					equidistantStart.x + equidistantStart.width,
+					equidistantStart.x + equidistantStart.width - RECTANGLE_OFFSET_Y,
+					equidistantStart.x + equidistantStart.width - RECTANGLE_OFFSET_Y
+			};
+		}
+		g.fillPolygon(x1, y, 3);
+		g.fillPolygon(x2, y, 3);
+		GraphHelper.drawLine(g,
+				equidistantStart.x + equidistantStart.width, equidistantStart.y + equidistantStart.height / 2,
+				right, equidistantStart.y + equidistantStart.height / 2);
 	}
 }

designer_base/src/com/fr/design/beans/location/MoveUtils.java

@@ -3,6 +3,8 @@
  */
 package com.fr.design.beans.location;
 
+import com.fr.stable.ArrayUtils;
+
 import javax.swing.*;
 import java.awt.*;
 import java.util.ArrayList;
@@ -17,6 +19,10 @@ public class MoveUtils {
 
 	public static final int SORPTION_UNIT = 5;
 
+	public static WidgetForbidWindow widgetForbidWindow = new WidgetForbidWindow();
+
+	public static ArrayList<EquidistantLine> equidistantLines = new ArrayList<>();
+
 	private MoveUtils() {
 
 	}
@@ -68,6 +74,30 @@ public class MoveUtils {
 		 * 
 		 */
 		int[] getHorizontalLine();
+
+		/**
+		 * 设置designer内部组件是否重叠的标志位
+		 * @param isIntersects 是否重叠
+		 */
+		void setWidgetsIntersects(boolean isIntersects);
+
+		/**
+		 * 获取designer内部组件是否重叠的标志位
+		 * @return 重叠
+		 */
+		boolean getWidgetsIntersects();
+
+		/**
+		 * 获取designer相对屏幕的位置
+		 * @return 位置
+		 */
+		Point getDesignerLocationOnScreen();
+
+		/**
+		 * 设置等距线
+		 * @param line 吸附线
+		 */
+		void setEquidistantLine(Absorptionline line);
 	}
 
 	public interface RectangleIterator {
@@ -183,6 +213,53 @@ public class MoveUtils {
 		}
 	}
 
+	private static void findEquidistantLine(Rectangle bounds, int left, int top, int height, int width) {
+		//最近的距离与坐标
+		EquidistantLine equidistantLineInfo = new EquidistantLine(0, 0, 0);
+		//等距线从各边中点画出，先要判断是不是在范围内
+		int topMiddleX = left + width / 2;
+		int leftMiddleY = top + height / 2;
+		if ((topMiddleX > bounds.getX()) && (topMiddleX < (bounds.getX() + bounds.getWidth()))){
+			//当前操作rec在bounds的下方
+			if (top > (bounds.getY() + bounds.getHeight())){
+				equidistantLineInfo.setDistance(top - (bounds.y + bounds.height));
+				equidistantLineInfo.setReference(bounds.y + bounds.height);
+				equidistantLineInfo.setDirection(SwingConstants.TOP);
+			}
+			//当前操作rec在bounds上方
+			if ((top + height) < bounds.getY()){
+				equidistantLineInfo.setDistance(bounds.y - (top + height));
+				equidistantLineInfo.setReference(bounds.y);
+				equidistantLineInfo.setDirection(SwingConstants.BOTTOM);
+			}
+		}
+		else if ((leftMiddleY > bounds.getY()) && (leftMiddleY < (bounds.getY() + bounds.getHeight()))){
+			//当前操作rec在bounds的右侧
+			if (left > (bounds.getX() + bounds.getWidth())){
+				equidistantLineInfo.setDistance(left - (bounds.x + bounds.width));
+				equidistantLineInfo.setReference(bounds.x + bounds.width);
+				equidistantLineInfo.setDirection(SwingConstants.LEFT);
+			}
+			//当前操作rec在bounds的左侧
+			if ((left + width) < bounds.getX()){
+				equidistantLineInfo.setDistance(bounds.x - (left + width));
+				equidistantLineInfo.setReference(bounds.x);
+				equidistantLineInfo.setDirection(SwingConstants.RIGHT);
+			}
+		}
+		if(equidistantLineInfo.getDistance() > 0) {
+			equidistantLines.add(equidistantLineInfo);
+		}
+	}
+
+	public static void displayForbidWindow(int x, int y) {
+		widgetForbidWindow.showWindow(x, y);
+	}
+
+	public static void hideForbidWindow() {
+		widgetForbidWindow.hideWindow();
+	}
+
 	/**
 	 * 吸附
 	 * 
@@ -197,28 +274,67 @@ public class MoveUtils {
 	 * @date 2015-2-12-下午2:39:16
 	 * 
 	 */
-	public static Point sorption(int x, int y, int width, int height, RectangleDesigner designer) {
+	public static Point sorption(int x, int y, int width, int height, RectangleDesigner designer, boolean isParameterLayout) {
 
 		int left = x, top = y, bottom = top + height, right = left + width;
 
+		Rectangle operatingRectangle = new Rectangle(x, y, width, height);
+
+		equidistantLines.clear();
+
 		PlacePointing px = new PlacePointing(x);
 		PlacePointing py = new PlacePointing(y);
+
+		PlacePointing pEquidistantX = new PlacePointing(x);
+		PlacePointing pEquidistantY = new PlacePointing(y);
+
 		RectangleIterator iterator = designer.createRectangleIterator();
 
 		java.util.List<Rectangle> cacheRecs = new ArrayList<Rectangle>();
+		//是否存在控件重叠
+		boolean isWidgetsIntersects = false;
 		while (iterator.hasNext()) {
 			Rectangle bounds = iterator.nextRectangle();
 			cacheRecs.add(bounds);
+			boolean isIntersects = operatingRectangle.intersects(bounds);
 			findX(px, bounds, left, right, width);
 			findY(py, bounds, top, bottom, height);
-			if (px.isFind() && py.isFind()) {
+
-				break;
+			if(isIntersects && !isParameterLayout){
+				isWidgetsIntersects = true;
+			}
+			else{
+				findEquidistantLine(bounds, left, top, height, width);
 			}
 		}
+		showForbiddenWindow(designer, x, y, isWidgetsIntersects);
 
 		createXAbsorptionline(px, designer, width, cacheRecs);
 		createYAbsorptionline(py, designer, height, cacheRecs);
-		return new Point(px.palce, py.palce);
+		operatingRectangle.x = px.palce;
+		operatingRectangle.y = py.palce;
+		createEquidistantLine(pEquidistantX, pEquidistantY, operatingRectangle, designer);
+		Point sorptionPoint = new Point(px.palce,py.palce);
+		if (!px.isFind()){
+			sorptionPoint.x = pEquidistantX.palce;
+		}
+		if (!py.isFind()){
+			sorptionPoint.y = pEquidistantY.palce;
+		}
+		return sorptionPoint;
+	}
+
+	public static void showForbiddenWindow(RectangleDesigner designer, int x, int y, boolean isIntersects){
+		if (isIntersects){
+			if(designer.getDesignerLocationOnScreen() != null) {
+				displayForbidWindow(x + designer.getDesignerLocationOnScreen().x, y + designer.getDesignerLocationOnScreen().y);
+			}
+			designer.setWidgetsIntersects(true);
+		}
+		else{
+			designer.setWidgetsIntersects(false);
+			hideForbidWindow();
+		}
 	}
 
 	private static void createXAbsorptionline(PlacePointing px, RectangleDesigner designer, int width, java.util.List<Rectangle> cacheRecs) {
@@ -300,6 +416,72 @@ public class MoveUtils {
 		}
 		designer.setYAbsorptionline(line);
 	}
+
+	private static void createEquidistantLine(PlacePointing px, PlacePointing py, Rectangle operatingRectangle, RectangleDesigner designer){
+		processEquidistantLinesList(px, py, operatingRectangle);
+		Absorptionline line = null;
+		if(equidistantLines.size() > 0) {
+			int top = -1;
+			int left = -1;
+			int bottom = -1;
+			int right = -1;
+			for(int i = 0; i < equidistantLines.size(); i++){
+				if (equidistantLines.get(i).getDirection() == SwingConstants.TOP){
+					top = equidistantLines.get(i).getReference();
+				}
+				if (equidistantLines.get(i).getDirection() == SwingConstants.LEFT){
+					left = equidistantLines.get(i).getReference();
+				}
+				if (equidistantLines.get(i).getDirection() == SwingConstants.BOTTOM){
+					bottom = equidistantLines.get(i).getReference();
+				}
+				if (equidistantLines.get(i).getDirection() == SwingConstants.RIGHT){
+					right = equidistantLines.get(i).getReference();
+				}
+			}
+			line = Absorptionline.createEquidistantAbsorptionline(operatingRectangle, top, left, bottom, right);
+		}
+		designer.setEquidistantLine(line);
+	}
+
+	private static void processEquidistantLinesList(PlacePointing pEquidistantX, PlacePointing pEquidistantY, Rectangle operatingRectangle){
+		EquidistantLine[] equidistantLines1 = new EquidistantLine[4];
+		//先按方向处理，只保留四个方向上距离最近
+		for(int count = 0; count < equidistantLines.size(); count++){
+			for (int direction = 0; direction < 4; direction++){
+				if(equidistantLines.get(count).getDirection() == (direction + 1)){//direction 1,2,3,4 分别对应top,left,bottom,right
+					if(equidistantLines1[direction] != null
+							&& equidistantLines1[direction].getDistance() > equidistantLines.get(count).getDistance()
+							|| equidistantLines1[direction] == null) {
+						equidistantLines1[direction] = equidistantLines.get(count);
+					}
+				}
+			}
+		}
+
+		equidistantLines.clear();
+		//找list中横纵分别等距的组合
+		if (equidistantLines1[0] != null && equidistantLines1[2] != null){//top, bottom
+			int offset = equidistantLines1[0].getDistance() - equidistantLines1[2].getDistance();
+			if (Math.abs(offset) <= SORPTION_UNIT * 2){
+				pEquidistantY.direction = SwingConstants.TOP;
+				equidistantLines.add(equidistantLines1[0]);
+				equidistantLines.add(equidistantLines1[2]);
+				pEquidistantY.palce = operatingRectangle.y - offset / 2;
+				operatingRectangle.y = pEquidistantY.palce;
+			}
+		}
+		if (equidistantLines1[1] != null && equidistantLines1[3] != null){//left, right
+			int offset = equidistantLines1[1].getDistance() - equidistantLines1[3].getDistance();
+			if (Math.abs(offset) <= SORPTION_UNIT * 2){
+				pEquidistantX.direction = SwingConstants.LEFT;
+				equidistantLines.add(equidistantLines1[1]);
+				equidistantLines.add(equidistantLines1[3]);
+				pEquidistantX.palce = operatingRectangle.x - offset / 2;
+				operatingRectangle.x = pEquidistantX.palce;
+			}
+		}
+	}
 	
 	//更新纵向行列线
 	private static void updateVerticalLine(int[] selfVertical, RectangleIterator iterator, Absorptionline line){
@@ -329,4 +511,43 @@ public class MoveUtils {
 		
 		return false;
 	}
+
+	private static class EquidistantLine{
+		//与操作rectangle的距离
+		private int distance;
+		//参考rectangle的位置
+		private int reference;
+		//等距线的方向
+		private int direction;
+
+		EquidistantLine(int distance, int reference, int direction){
+			this.distance = distance;
+			this.reference = reference;
+			this.direction = direction;
+		}
+
+		public void setDistance(int distance){
+			this.distance = distance;
+		}
+
+		public int getDistance(){
+			return this.distance;
+		}
+
+		public void setReference(int reference){
+			this.reference = reference;
+		}
+
+		public int getReference(){
+			return this.reference;
+		}
+
+		public void setDirection(int direction){
+			this.direction = direction;
+		}
+
+		public int getDirection(){
+			return this.direction;
+		}
+	}
 }

designer_base/src/com/fr/design/beans/location/WidgetForbidWindow.java

@@ -0,0 +1,48 @@
+package com.fr.design.beans.location;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.icon.IconPathConstants;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+
+/**
+ * Created by zhouping on 2016/7/24.
+ */
+public class WidgetForbidWindow extends JWindow {
+
+    private static final int WIDTH = 150;
+    private static final int HEIGHT = 20;
+
+    private UIButton promptButton = new UIButton(Inter.getLocText("FR-Designer_Forbid_Widgets_Intersects"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH));
+
+    /**
+     * 构造函数
+     */
+    public WidgetForbidWindow() {
+        this.add(promptButton);
+
+        this.setSize(WIDTH, HEIGHT);
+    }
+
+    /**
+     * 在指定位置显示窗口, 默认将window的中心点放到指定位置上
+     *
+     * @param x x坐标
+     * @param y y坐标
+     *
+     */
+    public void showWindow(int x, int y){
+        this.setLocation(x - WIDTH / 2, y - HEIGHT / 2);
+        this.setVisible(true);
+    }
+
+    /**
+     * 隐藏当前窗口
+     *
+     */
+    public void hideWindow(){
+        this.setVisible(false);
+    }
+}

designer_base/src/com/fr/design/designer/creator/CRPropertyDescriptor.java

@@ -3,7 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-import com.fr.design.gui.xtable.AbstractPropertyGroupModel;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
@@ -15,6 +14,7 @@ import java.beans.PropertyDescriptor;
  * @since 6.5.3
  */
 public final class CRPropertyDescriptor extends PropertyDescriptor {
+    public static final String RENDERER = "renderer";
 	
 	private PropertyChangeAdapter l;
 	
@@ -51,7 +51,7 @@ public final class CRPropertyDescriptor extends PropertyDescriptor {
     }
 
     public CRPropertyDescriptor setRendererClass(Class<?> clazz) {
-        this.putKeyValue(AbstractPropertyGroupModel.RENDERER, clazz);
+        this.putKeyValue(RENDERER, clazz);
         return this;
     }
 

designer_base/src/com/fr/design/extra/PluginManagerPane.java

@@ -67,6 +67,16 @@ public class PluginManagerPane extends BasicPane {
         }
     }
 
+    /**
+     * 以关键词打开设计器商店
+     *
+     * @param keyword 关键词
+     */
+    public PluginManagerPane(String keyword) {
+        this();
+        PluginWebBridge.getHelper().openWithSearch(keyword);
+    }
+
     private void addPane(String installHome) {
         PluginWebPane webPane = new PluginWebPane(new File(installHome).getAbsolutePath());
         add(webPane, BorderLayout.CENTER);

designer_base/src/com/fr/design/extra/PluginWebBridge.java

@@ -6,7 +6,6 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.extra.exe.*;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.general.SiteCenter;
 import com.fr.plugin.Plugin;
 import com.fr.plugin.PluginLicense;
 import com.fr.plugin.PluginLicenseManager;
@@ -18,13 +17,14 @@ import javafx.scene.web.WebEngine;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import netscape.javascript.JSObject;
+import org.json.JSONObject;
 
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.util.ArrayList;
+import java.util.*;
 import java.util.List;
 
 /**
@@ -35,6 +35,26 @@ public class PluginWebBridge {
     private static PluginWebBridge helper;
 
     private UIDialog uiDialog;
+    private ACTIONS action;
+    private String ACTION = "action";
+    private String KEYWORD = "keyword";
+    private Map<String, Object> config;
+
+    /**
+     * 动作枚举
+     */
+    public enum ACTIONS {
+        SEARCH("search");
+        private String context;
+
+        ACTIONS(String context) {
+            this.context = context;
+        }
+
+        public String getContext() {
+            return context;
+        }
+    }
 
     public static PluginWebBridge getHelper() {
         if (helper != null) {
@@ -59,6 +79,54 @@ public class PluginWebBridge {
     private PluginWebBridge() {
     }
 
+    /**
+     * 获取打开动作配置
+     *
+     * @return 配置信息
+     */
+    public String getRunConfig() {
+        if (action != null) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put(ACTION, action.getContext());
+            Set<String> keySet = config.keySet();
+            for (String key : keySet) {
+                jsonObject.put(key, config.get(key).toString());
+            }
+            return jsonObject.toString();
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 配置打开动作
+     *
+     * @param action 动作
+     * @param config 参数
+     */
+    public void setRunConfig(ACTIONS action, Map<String, Object> config) {
+        this.action = action;
+        this.config = config;
+    }
+
+    /**
+     * 清楚打开动作
+     */
+    public void clearRunConfig() {
+        this.action = null;
+        this.config = null;
+    }
+
+    /**
+     * 打开时搜索
+     *
+     * @param keyword 关键词
+     */
+    public void openWithSearch(String keyword) {
+        HashMap<String, Object> map = new HashMap<String, Object>(2);
+        map.put(KEYWORD, keyword);
+        setRunConfig(ACTIONS.SEARCH, map);
+    }
+
     public void setEngine(WebEngine webEngine) {
         this.webEngine = webEngine;
     }
@@ -203,7 +271,7 @@ public class PluginWebBridge {
      *
      * @return 已安装的插件授权对象
      */
-    public PluginLicense getPluginLicenseByID(String pluginID ) {
+    public PluginLicense getPluginLicenseByID(String pluginID) {
         return PluginLicenseManager.getInstance().getPluginLicenseByID(pluginID);
     }
 
@@ -296,7 +364,7 @@ public class PluginWebBridge {
     /**
      * 在本地浏览器里打开url
      * tips:重载的时候,需要给js调用的方法需要放在前面,否则可能不会被调用(此乃坑)
-     *      所以最好的是不要重载在js可以访问的接口文件中
+     * 所以最好的是不要重载在js可以访问的接口文件中
      *
      * @param url 要打开的地址
      */

designer_base/src/com/fr/design/fun/ParameterWindowEditorProcessor.java

@@ -0,0 +1,20 @@
+package com.fr.design.fun;
+
+import com.fr.design.designer.creator.CRPropertyDescriptor;
+import com.fr.stable.fun.mark.Immutable;
+
+/**
+ * Created by zpc on 16/7/21.
+ */
+public interface ParameterWindowEditorProcessor extends Immutable {
+
+    String MARK_STRING = "ParameterWindowEditorProcessor";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 生成属性表
+     */
+    CRPropertyDescriptor[] createPropertyDescriptor(Class<?> temp);
+}
+

designer_base/src/com/fr/design/fun/impl/AbstractParameterWindowEditorProcessor.java

@@ -0,0 +1,31 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.designer.creator.CRPropertyDescriptor;
+import com.fr.design.fun.ParameterWindowEditorProcessor;
+import com.fr.stable.fun.mark.API;
+
+
+/**
+ * Created by zpc on 2016/7/21.
+ */
+@API(level = ParameterWindowEditorProcessor.CURRENT_LEVEL)
+public abstract class AbstractParameterWindowEditorProcessor implements ParameterWindowEditorProcessor {
+
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+
+
+
+    /**
+     * 生成属性表
+     */
+    @Override
+    public CRPropertyDescriptor[] createPropertyDescriptor(Class<?> temp) {
+        return new CRPropertyDescriptor[0];
+    }
+}

designer_base/src/com/fr/design/gui/columnrow/ColumnRowPane.java

@@ -22,6 +22,7 @@ import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.ispinner.UpperCaseSpinner;
+import com.fr.design.gui.ispinner.ColumnRowSpinner;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.StableUtils;
@@ -119,7 +120,7 @@ public class ColumnRowPane extends JPanel implements UIObserver {
 
 
 	protected void initRowSpinner() {
-		rowSpinner = new UIBasicSpinner((new SpinnerListModel(rowarray))) {
+		rowSpinner = new ColumnRowSpinner((new SpinnerListModel(rowarray))) {
 			public boolean shouldResponseChangeListener() {
 				return false;
 			}

designer_base/src/com/fr/design/gui/frpane/RegPane.java

@@ -48,15 +48,15 @@ public class RegPane extends BasicPane {
 		new MobileReg(),
 		new CustomReg()
 	};
-	
+
 	public static final RegExp[] TEXTAREA_REG_TYPE = {
 		new NoneReg(),
 		new LengthReg(),
 		new CustomReg()
 	};
-	
+
 	public static final RegExp[] PASSWORD_REG_TYPE = TEXTAREA_REG_TYPE;
-	
+
 	private RegExp[] regType;
 	private UIComboBox regComboBox;
 	private CardLayout detailedCardLayout;
@@ -64,16 +64,21 @@ public class RegPane extends BasicPane {
 	private RegPhonePane regPhonePane;
 	private DefaultRegPane defaultRegPane;
 	private CustomRegRexPane customRegRexPane;
-		
+
+
+	public UIComboBox getRegComboBox(){
+		return regComboBox;
+	}
+
 	public RegPane() {
 		this(ALL_REG_TYPE);
 	}
-	
+
 	public RegPane(RegExp[] types) {
 		this.regType = types;
 		this.initComponents();
 	}
-	
+
 	private void initComponents(){
 		this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
 		JPanel contentPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
@@ -82,7 +87,7 @@ public class RegPane extends BasicPane {
 		regComboBox = new UIComboBox(regType);
 		regComboBox.setRenderer(listCellRender);
 		contentPane.add(regComboBox);
-		
+
 		final JPanel cardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
 		detailedCardLayout = new CardLayout();
 		cardPane.setLayout(detailedCardLayout);
@@ -90,7 +95,7 @@ public class RegPane extends BasicPane {
 		cardPane.add((regLengthPane = new RegLengthPane()), "Length");
 		cardPane.add((regPhonePane = new RegPhonePane()), "Phone");
 		cardPane.add((customRegRexPane = new CustomRegRexPane()), "Custom");
-		
+
 		this.add(cardPane);
 		regComboBox.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e) {
@@ -111,15 +116,15 @@ public class RegPane extends BasicPane {
 					}
 					fireRegChangeAction();
 				}
-			}		
+			}
 		});
 	}
-	
+
 	@Override
 	protected String title4PopupWindow() {
 		return Inter.getLocText("FR-Designer_Input_Rule");
 	}
-	
+
 	private int getRegTypeIndex(RegExp regex) {
 		if (regex != null) {
 			for (int i = 0; i < regType.length; i++) {
@@ -131,7 +136,7 @@ public class RegPane extends BasicPane {
 
 		return 0;
 	}
-	
+
 	public void populate(RegExp regex) {
 		regComboBox.setSelectedIndex(getRegTypeIndex(regex));
 		if (regex instanceof LengthReg) {
@@ -144,111 +149,111 @@ public class RegPane extends BasicPane {
 			defaultRegPane.populate(regex);
 		}
 	}
-	
+
 	public RegExp update(){
 		RegExp regExp = (RegExp)regComboBox.getSelectedItem();
-		
+
 		if (regExp instanceof LengthReg){
 			return regLengthPane.update();
 		} else if(regExp instanceof PhoneReg) {
 			return regPhonePane.update();
-		} else if(regExp instanceof NoneReg || regExp instanceof MailReg || regExp instanceof IDCardReg 
+		} else if(regExp instanceof NoneReg || regExp instanceof MailReg || regExp instanceof IDCardReg
-			|| regExp instanceof PostCardReg || regExp instanceof PhoneReg || regExp instanceof MobileReg) {
+				|| regExp instanceof PostCardReg || regExp instanceof PhoneReg || regExp instanceof MobileReg) {
 			return regExp;
 		}
 		else if (regExp instanceof CustomReg){
-            if (customRegRexPane.isEmpty()) {
+			if (customRegRexPane.isEmpty()) {
-                return new NoneReg();
+				return new NoneReg();
-            }
+			}
 			return customRegRexPane.update();
 		} else {
 			return defaultRegPane.update();
 		}
 	}
-	
+
 	private static abstract class DisplayPane extends BasicPane {
 		public abstract void populate(RegExp regRex);
-		
+
 		public abstract RegExp update();
 	}
-	
+
 	private static class DefaultRegPane extends DisplayPane {
 		public RegExp regRex;
-		
+
 		public DefaultRegPane(){
-			
+
 		}
 
-		
+
 		@Override
 		protected String title4PopupWindow() {
 			return "Default";
 		}
-		
+
 		@Override
 		public void populate(RegExp regRex) {
-		    
+
 		}
 
 		@Override
 		public RegExp update() {
-		
+
 			return this.regRex;
-		}		
+		}
 	}
-	
+
 	/**
 	 * 添加电话规则监听器
-	 * 
+	 *
 	 * @param listener 监听器
-	 * 
+	 *
 	 *
 	 * @date 2014-12-3-下午7:30:55
-	 * 
+	 *
 	 */
 	public void addPhoneRegListener(PhoneRegListener listener) {
 		this.listenerList.add(PhoneRegListener.class, listener);
 	}
-	
+
 	/**
 	 * 移除电话规则监听器
-	 * 
+	 *
 	 * @param listener 监听器
-	 * 
+	 *
 	 *
 	 * @date 2014-12-3-下午7:30:55
-	 * 
+	 *
 	 */
 	public void removePhoneRegListener(PhoneRegListener listener) {
 		this.listenerList.remove(PhoneRegListener.class, listener);
 	}
-	
+
 	/**
 	 * 添加正则监听器
-	 * 
+	 *
 	 * @param listener 监听器
-	 * 
+	 *
 	 *
 	 * @date 2014-12-3-下午7:29:48
-	 * 
+	 *
 	 */
 	public void addRegChangeListener(RegChangeListener listener) {
 		this.listenerList.add(RegChangeListener.class, listener);
 	}
-	
+
 	/**
 	 * 移除正则监听器
-	 * 
+	 *
 	 * @param listener 监听器
-	 * 
+	 *
 	 *
 	 * @date 2014-12-3-下午7:29:48
-	 * 
+	 *
 	 */
 	public void removeRegChangeListener(RegChangeListener listener) {
 		this.listenerList.remove(RegChangeListener.class, listener);
 	}
-	
+
 	public class PhoneRegEvent extends EventObject {
 		private String phoneRegString;
 		public PhoneRegEvent(Object source, String phoneRegString) {
@@ -275,48 +280,48 @@ public class RegPane extends BasicPane {
 			return regString;
 		}
 	}
-	
+
 	public interface PhoneRegListener extends EventListener{
-		
+
 		/**
 		 * 电话规则变化监听
-		 * 
+		 *
 		 * @param e 变化事件
-		 * 
+		 *
 		 *
 		 * @date 2014-12-3-下午7:29:01
-		 * 
+		 *
 		 */
 		void phoneRegChangeAction(PhoneRegEvent e);
-	
+
 	}
-	
+
 	public interface RegChangeListener extends EventListener {
-		
+
 		/**
 		 * 正则表达规则变化监听
-		 * 
+		 *
 		 *
 		 * @date 2014-12-3-下午7:29:01
-		 * 
+		 *
 		 */
 		void regChangeAction();
 	}
 	protected void firePhoneRegAction(String phoneReg) {
 		Object[] listeners = listenerList.getListenerList();
-       for (int i = listeners.length-2; i>=0; i-=2) {   
+		for (int i = listeners.length-2; i>=0; i-=2) {
-           if (listeners[i]==PhoneRegListener.class) {
+			if (listeners[i]==PhoneRegListener.class) {
-               ((PhoneRegListener)listeners[i+1]).phoneRegChangeAction(new PhoneRegEvent(this , phoneReg));   
+				((PhoneRegListener)listeners[i+1]).phoneRegChangeAction(new PhoneRegEvent(this , phoneReg));
-           }   
+			}
-       }   
+		}
 	}
 	protected void fireRegChangeAction() {
 		Object[] listeners = listenerList.getListenerList();
-       for (int i = listeners.length-2; i>=0; i-=2) {   
+		for (int i = listeners.length-2; i>=0; i-=2) {
-           if (listeners[i]==RegChangeListener.class) {
+			if (listeners[i]==RegChangeListener.class) {
-               ((RegChangeListener)listeners[i+1]).regChangeAction();   
+				((RegChangeListener)listeners[i+1]).regChangeAction();
-           }   
+			}
-       }   
+		}
 	}
 	private class RegPhonePane extends DisplayPane {
 		private static final String EMB_REG1 = "025-85679591";
@@ -324,7 +329,7 @@ public class RegPane extends BasicPane {
 		private static final String EMB_REG3 = "025 85679591";
 		private static final int LIMIT_LENGTH = 20;
 		private static final String REG_PATTERN = "0123456789-*# ";
-		
+
 		private UIComboBox dataTypeComboBox;
 		private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, Inter.getLocText("FR-Designer_Custom")};
 		DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType);
@@ -357,7 +362,7 @@ public class RegPane extends BasicPane {
 		protected String title4PopupWindow() {
 			return "PHONE";
 		}
-		
+
 		@Override
 		public void populate(RegExp regRex) {
 			if(!(regRex instanceof PhoneReg)) {
@@ -369,13 +374,13 @@ public class RegPane extends BasicPane {
 			}
 			dataTypeComboBox.setSelectedItem(((PhoneReg)regRex).getRegString());
 		}
-		
+
 		private boolean checkEmbedded(String regstr){
 			return !ComparatorUtils.equals(EMB_REG1, regstr) &&
-				   !ComparatorUtils.equals(EMB_REG2, regstr) &&
+					!ComparatorUtils.equals(EMB_REG2, regstr) &&
-				   !ComparatorUtils.equals(EMB_REG3, regstr);
+					!ComparatorUtils.equals(EMB_REG3, regstr);
 		}
-		
+
 		@Override
 		public RegExp update() {
 			PhoneReg regRex = new PhoneReg();
@@ -383,11 +388,11 @@ public class RegPane extends BasicPane {
 			return regRex;
 		}
 	}
-	
+
 	private static class RegLengthPane extends DisplayPane {
 		private UISpinner minLenSpinner;
 		private UISpinner maxLenSpinner;
-		
+
 		public RegLengthPane(){
 			this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
 			this.add(new UILabel(Inter.getLocText("FR-Designer_Reg_Min_Length") + ":"));
@@ -395,9 +400,9 @@ public class RegPane extends BasicPane {
 			this.add(minLenSpinner);
 			this.add(new UILabel(Inter.getLocText("FR-Designer_Reg_Max_Length") + ":"));
 			maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-			this.add(maxLenSpinner);			
+			this.add(maxLenSpinner);
 		}
-		
+
 		@Override
 		protected String title4PopupWindow() {
 			return "LENGTH";
@@ -408,11 +413,11 @@ public class RegPane extends BasicPane {
 			if (!(regRex instanceof LengthReg)){
 				return;
 			}
-			
+
 			int minLength = ((LengthReg)regRex).getMinLen();
 			int maxLength = ((LengthReg)regRex).getMaxLen();
 			minLenSpinner.setValue(minLength);
-			maxLenSpinner.setValue(maxLength);			
+			maxLenSpinner.setValue(maxLength);
 		}
 
 		@Override
@@ -422,21 +427,21 @@ public class RegPane extends BasicPane {
 			LengthReg regRex = new LengthReg();
 			regRex.setMinLen(startLength);
 			regRex.setMaxLen(endLength);
-			
+
 			return regRex;
-		}		
+		}
 	}
-	
+
 	private static class CustomRegRexPane extends DisplayPane{
 		private UITextField regTextField;
-		
+
 		public CustomRegRexPane(){
 			this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
 			this.add(new UILabel(Inter.getLocText("FR-Designer_Reg_Expressions") + ":"));
 			regTextField = new UITextField(20);
 			this.add(regTextField);
 		}
-		
+
 		@Override
 		protected String title4PopupWindow() {
 			return "CUSTOM";
@@ -451,19 +456,19 @@ public class RegPane extends BasicPane {
 		}
 
 		@Override
-		public RegExp update() {			
+		public RegExp update() {
 			return new CustomReg(regTextField.getText());
 		}
 
-        public boolean isEmpty() {
+		public boolean isEmpty() {
-            return StringUtils.isEmpty(regTextField.getText());
+			return StringUtils.isEmpty(regTextField.getText());
-        }
+		}
 	}
-	
+
 	ListCellRenderer listCellRender = new UIComboBoxRenderer(){
 		@Override
 		public Component getListCellRendererComponent(JList list, Object value,
-				int index, boolean isSelected, boolean cellHasFocus) {
+													  int index, boolean isSelected, boolean cellHasFocus) {
 			super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if (value instanceof NoneReg){
 				this.setText(Inter.getLocText("FR-Designer_None"));
@@ -484,6 +489,6 @@ public class RegPane extends BasicPane {
 			}
 			return this;
 		}
-		
+
 	};
 }

designer_base/src/com/fr/design/gui/ispinner/ColumnRowSpinner.java

@@ -0,0 +1,123 @@
+package com.fr.design.gui.ispinner;
+
+import java.text.ParseException;
+import java.util.List;
+
+import javax.swing.JComponent;
+import javax.swing.JFormattedTextField;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerDateModel;
+import javax.swing.SpinnerListModel;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultFormatterFactory;
+import javax.swing.text.DocumentFilter;
+
+import com.fr.stable.StableUtils;
+//_kerry: 用来修复Spinner输入数字自动填充的bug
+public class ColumnRowSpinner extends UIBasicSpinner {
+    public ColumnRowSpinner(SpinnerModel model) {
+        super(model);
+    }
+
+    protected JComponent createEditor(SpinnerModel model) {
+        if (model instanceof SpinnerDateModel) {
+            return new DateEditor(this);
+        } else if (model instanceof SpinnerListModel) {
+            return new FillBugEditor(this);
+        } else if (model instanceof SpinnerNumberModel) {
+            return new NumberEditor(this);
+        } else {
+            return new DefaultEditor(this);
+        }
+    }
+
+    private class FillBugEditor extends DefaultEditor {
+        public FillBugEditor(JSpinner spinner) {
+            super(spinner);
+            if (!(spinner.getModel() instanceof SpinnerListModel)) {
+                throw new IllegalArgumentException(
+                        "model not a SpinnerListModel");
+            }
+            getTextField().setEditable(true);
+            getTextField().setFormatterFactory(
+                    new DefaultFormatterFactory(new ListFormatter()));
+        }
+
+        public SpinnerListModel getModel() {
+            return (SpinnerListModel) (getSpinner().getModel());
+        }
+
+        private class ListFormatter extends
+                JFormattedTextField.AbstractFormatter {
+            private DocumentFilter filter;
+
+            public String valueToString(Object value) throws ParseException {
+                if (value == null) {
+                    return "";
+                }
+                return value.toString();
+            }
+
+            public Object stringToValue(String string)
+                    throws ParseException {
+                //add将行数转换成ABC
+                return string;
+            }
+
+            protected DocumentFilter getDocumentFilter() {
+                if (filter == null) {
+                    filter = new Filter();
+                }
+                return filter;
+            }
+
+            private class Filter extends DocumentFilter {
+                public void replace(FilterBypass fb, int offset,
+                                    int length, String string, AttributeSet attrs)
+                        throws BadLocationException {
+                    if (string != null
+                            && (offset + length) == fb.getDocument()
+                            .getLength()) {
+                        List list = getModel().getList();
+                        Object next = null;
+                        for (int counter = 0; counter < list.size(); counter++) {
+                            Object value = list.get(counter);
+                            String str = value.toString();
+
+                            if (str != null
+                                    && str.startsWith(fb.getDocument()
+                                    .getText(0, offset)
+                                    + string)) {
+                                next = value;
+                                break;
+                            }
+                        }
+
+                        String value = (next != null) ? next.toString()
+                                : null;
+
+                        if (value != null) {
+                            fb.remove(0, offset + length);
+                            fb.insertString(0, value, null);
+                            getFormattedTextField().select(
+                                    offset + string.length(),
+                                    value.length());
+                            return;
+                        }
+                    }
+                    super.replace(fb, offset, length, string, attrs);
+                }
+
+                public void insertString(FilterBypass fb, int offset,
+                                         String string, AttributeSet attr)
+                        throws BadLocationException {
+                    replace(fb, offset, 0, string, attr);
+                }
+            }
+        }
+    }
+
+}

designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@@ -22,6 +22,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.plugin.ExtraClassManager;
 import com.fr.report.fun.VerticalTextProcessor;
+import com.fr.report.fun.impl.DefaultVerticalTextProcessor;
 import com.fr.stable.Constants;
 
 import javax.swing.*;
@@ -134,10 +135,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private void initTextRotationCombox(){
         ArrayList<String> selectOption = new ArrayList<String>();
         selectOption.add(Inter.getLocText("FR-Designer_Custom-Angle"));
-        VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG);
+        VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class);
-        if (processor != null){
+		selectOption.addAll(Arrays.asList(processor.getComboxOption()));
-            selectOption.addAll(Arrays.asList(processor.getComboxOption()));
-        }
 
         textRotationComboBox = new UIComboBox(selectOption.toArray(new String[selectOption.size()]));
     }
@@ -241,7 +240,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 		} else {
 			this.textComboBox.setSelectedIndex(0);
 		}
-		if (style.getVerticalText() == Style.VERTICALTEXT && ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) != null) {
+		if (style.getVerticalText() == Style.VERTICALTEXT) {
 			textRotationComboBox.setSelectedIndex(style.getTextDirection() == Style.LEFT_TO_RIGHT ? 1 : 2);
 		} else {
 			textRotationComboBox.setSelectedIndex(0);

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -301,7 +301,6 @@ public abstract class ToolBarMenuDock {
         if (ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)) {
             shortCuts.add(new FeedBackAction());
             shortCuts.add(SeparatorDef.DEFAULT);
-            shortCuts.add(new SupportQQAction());
             shortCuts.add(SeparatorDef.DEFAULT);
           //  shortCuts.add(new ForumAction());
         }

designer_base/src/com/fr/design/style/AlignmentPane.java

@@ -16,8 +16,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
-import com.fr.plugin.ExtraClassManager;
-import com.fr.report.fun.VerticalTextProcessor;
 import com.fr.stable.CoreConstants;
 
 import javax.swing.*;
@@ -126,9 +124,6 @@ public class AlignmentPane extends BasicPane {
         directionBG.add(rightToLeftRB);
         rightToLeftRB.setSelected(true);
 
-        if (ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) == null){
-            return;
-        }
         isVerticalTextPanel.add(isVerticalTextCheckBox);
         isVerticalTextPanel.add(leftToRightRB);
         isVerticalTextPanel.add(rightToLeftRB);
@@ -302,9 +297,6 @@ public class AlignmentPane extends BasicPane {
     }
 
     private void populateVertical(Style style){
-        if (ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) == null){
-            return;
-        }
         this.isVerticalTextCheckBox.setSelected(true);
         this.rotationSpinner.setEnabled(false);
         if (style.getTextDirection() == Style.LEFT_TO_RIGHT) {

designer_chart/build.gradle

@@ -0,0 +1,57 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+
+version='8.0'
+
+def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design"
+def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib"
+
+
+jar{
+	baseName='fr-designer-chart'
+}
+
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/designer_chart/src"]
+			}
+		}
+}
+dependencies{
+compile fileTree(dir:'../../',include:'**/*.jar')
+compile fileTree(dir:libDir,include:'*.jar')
+compile fileTree(dir:"${libDir}/jetty",include:'*.jar')
+ 	testCompile 'junit:junit:4.12'
+}
+
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/designer_chart/src"){
+			exclude '**/*.java'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+//ѹËõÏîÄ¿ÖеÄjsÎļþ
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../lib',includes:'*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/designer_chart/src"){
+			include (name:'**/*.js')
+
+		}
+
+	}
+}
+jar.dependsOn compressJS
+

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -58,7 +58,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         if (classManager == null) {
             classManager = new ChartTypeInterfaceManager();
             chartTypeInterfaces.clear();
-            classManager.readXMLFile();
         }
         return classManager;
     }
@@ -75,16 +74,15 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         GeneralContext.addPluginReadListener(new PluginReadListener() {
             @Override
             public void success() {
-                if (chartTypeInterfaces != null) {
+                ChartTypeInterfaceManager.getInstance().readDefault();
-                    readDefault();
+                //重新注册designModuleFactory
-                    //重新注册designModuleFactory
+                DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
-                    DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
-                }
             }
         });
     }
 
     public static WidgetOption[] initWidgetOption(){
+
         ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
         ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
         for (int i = 0; i < typeName.length; i++) {
@@ -101,7 +99,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     }
 
     private synchronized static void envChanged() {
-        chartTypeInterfaces.clear();
+        classManager = null;
     }
 
     private static void readDefault() {
@@ -132,6 +130,12 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         }
     }
 
+    public static void addChartTypeInterface(IndependentChartUIProvider provider, String plotID) {
+        if (chartTypeInterfaces != null && !chartTypeInterfaces.containsKey(plotID)) {
+            chartTypeInterfaces.put(plotID, provider);
+        }
+    }
+
     /**
      * 增加界面接口定义
      *
@@ -141,7 +145,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     public void addChartInterface(String className, String plotID, PluginSimplify simplify) {
         if (StringUtils.isNotBlank(className)) {
             try {
-                Class<?> clazz = loader.loadClass(className);
+                Class<?> clazz = Class.forName(className);
                 Authorize authorize = clazz.getAnnotation(Authorize.class);
                 if (authorize != null) {
                     PluginLicenseManager.getInstance().registerPaid(authorize, simplify);
@@ -149,8 +153,8 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
                 IndependentChartUIProvider provider = (IndependentChartUIProvider) clazz.newInstance();
                 if (PluginCollector.getCollector().isError(provider, IndependentChartUIProvider.CURRENT_API_LEVEL, simplify.getPluginName()) || !containsChart(plotID)) {
                     PluginMessage.remindUpdate(className);
-                } else if (!chartTypeInterfaces.containsKey(plotID)) {
+                } else {
-                    chartTypeInterfaces.put(plotID, provider);
+                    ChartTypeInterfaceManager.getInstance().addChartTypeInterface(provider, plotID);
                 }
             } catch (ClassNotFoundException e) {
                 FRLogger.getLogger().error("class not found:" + e.getMessage());

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -4,7 +4,6 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.ChartFactory;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.design.beans.BasicBeanPane;
@@ -43,8 +42,22 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(hyperEditPane, BorderLayout.CENTER);
+        ChartCollection cc = createChartCollection();
 		
-		ChartCollection cc = new ChartCollection();
+		chartComponent = new ChartComponent();
+		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+		chartComponent.setSupportEdit(false);
+		chartComponent.populate(cc);
+		
+		this.add(chartComponent, BorderLayout.EAST);
+		
+		hyperEditPane.populate(cc);
+		
+		hyperEditPane.useChartComponent(chartComponent);
+	}
+
+    private ChartCollection createChartCollection() {
+        ChartCollection cc = new ChartCollection();
 
         Chart chart = ChartTypeManager.getFirstChart();
         if (chart != null){
@@ -57,20 +70,10 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         }else {
             cc.addChart(new Chart(new Bar2DPlot()));
         }
-		
+        return cc;
-		chartComponent = new ChartComponent();
+    }
-		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+
-		chartComponent.setSupportEdit(false);
+    protected int getChartParaType() {
-		chartComponent.populate(cc);
-		
-		this.add(chartComponent, BorderLayout.EAST);
-		
-		hyperEditPane.populate(cc);
-		
-		hyperEditPane.useChartComponent(chartComponent);
-	}
-	
-	protected int getChartParaType() {
 		return ParameterTableModel.CHART_NORMAL_USE;
 	}
 
@@ -99,8 +102,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		BaseChartCollection cc = chartHyperlink.getChartCollection();
 		if (cc == null || cc.getChartCount() < 1) {
-			cc = new ChartCollection();
+			cc = createChartCollection();
-			cc.addChart(new Chart(ChartFactory.createBar2DPlot()));
 			chartHyperlink.setChartCollection(cc);
 		}
 		

designer_chart/src/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

@@ -102,8 +102,13 @@ public class NormalChartDataPane extends DataContentsPane {
 	public void populate(ChartCollection collection) {
 		reportDataPane.refreshContentPane(collection);
 		tableDataPane.refreshContentPane(collection);
-		
+
-		dataPane.populateBean(collection);
+		if(collection != null && collection.getSelectedChart().getFilterDefinition() == null) {
+			reportDataPane.populateBean(collection);
+			tableDataPane.populateBean(collection);
+		} else {
+			dataPane.populateBean(collection);
+		}
 		this.initAllListeners();
 		this.addAttributeChangeListener(listener);
 		

designer_chart/src/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java

@@ -58,6 +58,7 @@ public class ChartLabelFontPane extends BasicScrollPane<Chart> {
         }
         cateTextAttrPane.populate(cateTextAttr);
         categoryName.setSelected(meterPlot.isShowCateName());
+        cateTextAttrPane.setEnabled(meterPlot.isShowCateName());
     }
 
 

designer_form/build.gradle

@@ -0,0 +1,65 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+
+version='8.0'
+
+def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design"
+def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib"
+
+
+jar{
+	baseName='fr-designer-report'
+}
+
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/designer/src",
+"${srcDir}/designer_form/src"]
+			}
+		}
+}
+dependencies{
+compile fileTree(dir:'../../',include:'**/*.jar')
+compile fileTree(dir:libDir,include:'*.jar')
+compile fileTree(dir:"${libDir}/jetty",include:'*.jar')
+ 	testCompile 'junit:junit:4.12'
+}
+
+
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/designer/src"){
+			exclude '**/*.java'
+		}
+		from ("${srcDir}/designer_form/src")
+		into ('build/classes/main')
+	}
+
+}
+
+
+//ѹËõÏîÄ¿ÖеÄjsÎļþ
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../lib',includes:'*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/designer/src"){
+			include (name:'**/*.js')
+
+		}
+		fileset (dir:"${srcDir}/designer_form/src"){
+			include (name:'**/*.js')
+
+		}
+
+	}
+}
+jar.dependsOn compressJS
+

designer_form/src/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java

@@ -100,7 +100,10 @@ public class CompositeComponentAdapter implements ComponentAdapter {
 		for (CRPropertyDescriptor property : properties) {
 			String groupName = (String) property.getValue(XCreatorConstants.PROPERTY_CATEGORY);
 			if (StringUtils.isEmpty(groupName)) {
-				groupName = XCreatorConstants.DEFAULT_GROUP_NAME;
+				groupName = (String) property.getValue(XCreatorConstants.PROPERTY_VALIDATE);
+				if(StringUtils.isEmpty(groupName)){
+					groupName = XCreatorConstants.DEFAULT_GROUP_NAME;
+				}
 			}
 			ArrayList<CRPropertyDescriptor> groupProperties = maps.get(groupName);
 			if (groupProperties == null) {
@@ -110,6 +113,7 @@ public class CompositeComponentAdapter implements ComponentAdapter {
 			}
 			groupProperties.add(property);
 		}
+		adjustGroupNamesPosition(groupNames);
 		ArrayList<PropertyGroupModel> groups = new ArrayList<PropertyGroupModel>();
 		for (String groupName : groupNames) {
 			ArrayList<CRPropertyDescriptor> groupProperties = maps.get(groupName);
@@ -120,6 +124,15 @@ public class CompositeComponentAdapter implements ComponentAdapter {
 		return groups;
 	}
 
+		public void adjustGroupNamesPosition(ArrayList<String> groupNames){
+			for(String groupName : groupNames){
+				if(groupName.equals("Form-Basic_Properties")){
+					groupNames.remove(groupName);
+					groupNames.add(0,groupName);
+					break;
+				}
+			}
+		}
 	@Override
 	public ArrayList<GroupModel> getXCreatorPropertyModel() {
 		ArrayList<GroupModel> groupModels = new ArrayList<GroupModel>();
@@ -130,7 +143,7 @@ public class CompositeComponentAdapter implements ComponentAdapter {
 		groupModels.addAll(groups);
 		return groupModels;
 	}
-	
+
 	/**
 	 * 自适应布局中放置文本框等用的scaleLayout和报表块、图表块支持的标题控件用的titleLayout时
 	 * 控件树处只显示父容器，但是控件属性还是为自身的

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@@ -1,22 +1,30 @@
 package com.fr.design.designer.beans.adapters.layout;
 
-import java.awt.Rectangle;
+import java.awt.*;
 
+import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
-import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.beans.HoverPainter;
-import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter;
-import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.*;
-import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.properties.BoundsGroupModel;
+import com.fr.design.designer.properties.FRAbsoluteLayoutPropertiesGroupModel;
+import com.fr.design.designer.properties.FRFitLayoutPropertiesGroupModel;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 
 public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
-
+	private HoverPainter painter;
     public FRAbsoluteLayoutAdapter(XLayoutContainer container) {
         super(container);
+		painter = new FRAbsoluteLayoutPainter(container);
     }
+
+	@Override
+	public HoverPainter getPainter() {
+		return painter;
+	}
     
     /**
      * 是否能在指定位置添加组件
@@ -27,8 +35,15 @@ public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
      */
     @Override
 	public boolean accept(XCreator creator, int x, int y) {
-		return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
+		Component comp = container.getComponentAt(x, y);
+		//布局控件要先判断是不是可编辑
+		XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator)comp).getTopLayout();
+		if(topLayout != null && !topLayout.isEditable()){
+			return false;
+		}
+		boolean isAccept =  x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
 				&& creator.getWidth() <= container.getWidth();
+		return isAccept;
 	}
 
     @Override
@@ -46,10 +61,20 @@ public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
 		}
 
 		fix(creator, x, y);
-		container.add(creator);
+
+		if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
+			addParentCreator(creator);
+		} else {
+			container.add(creator, creator.toData().getWidgetName());
+		}
 		LayoutUtils.layoutRootContainer(container);
 	}
-    
+
+	private void addParentCreator(XCreator child) {
+		XLayoutContainer parentPanel = child.initCreatorWrapper(child.getHeight());
+		container.add(parentPanel, child.toData().getWidgetName());
+	}
+
     /**
      * 组件拖拽后调整大小
      * @param creator 组件
@@ -87,4 +112,10 @@ public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
     public ConstraintsGroupModel getLayoutConstraints(XCreator creator) {
         return new BoundsGroupModel((XWAbsoluteLayout)container, creator);
     }
+
+	@Override
+	public GroupModel getLayoutProperties() {
+		XWAbsoluteLayout xwAbsoluteLayout = (XWAbsoluteLayout) container;
+		return new FRAbsoluteLayoutPropertiesGroupModel(xwAbsoluteLayout);
+	}
 }

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyFitLayoutAdapter.java

@@ -1,21 +0,0 @@
-package com.fr.design.designer.beans.adapters.layout;
-
-import com.fr.design.beans.GroupModel;
-import com.fr.design.designer.creator.XLayoutContainer;
-import com.fr.design.designer.creator.XWFitLayout;
-import com.fr.design.designer.properties.BodyMobileLayoutPropertiesGroupModel;
-
-public class FRBodyFitLayoutAdapter extends FRFitLayoutAdapter {
-
-	public FRBodyFitLayoutAdapter(XLayoutContainer container) {
-		super(container);
-	}
-	/**
-	 * 返回布局自身属性，方便一些特有设置在layout刷新时处理
-	 */
-	@Override
-    public GroupModel getLayoutProperties() {
-		XWFitLayout xfl = (XWFitLayout) container;
-        return new BodyMobileLayoutPropertiesGroupModel(xfl);
-    }
-}

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java

@@ -117,9 +117,6 @@ public class FRFitLayoutAdapter extends AbstractLayoutAdapter {
 	 */
 	@Override
 	public void addComp(XCreator child, int x, int y) {
-		if (ComparatorUtils.equals(child.getIconPath(), WIDGETPANEICONPATH)) {
-			return;
-		}
 		fix(child, x, y);
 		if (child.shouldScaleCreator() || child.hasTitleStyle()) {
 			addParentCreator(child);

designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java

@@ -3,20 +3,17 @@
  */
 package com.fr.design.designer.beans.location;
 
-import java.awt.Cursor;
+import java.awt.*;
-import java.awt.Point;
-import java.awt.Rectangle;
 
 import com.fr.design.beans.location.Absorptionline;
 import com.fr.design.beans.location.MoveUtils;
+import com.fr.design.designer.creator.*;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
-import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.utils.ComponentUtils;
-import com.fr.design.designer.creator.XLayoutContainer;
-import com.fr.design.designer.creator.XWBorderLayout;
-import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import com.fr.form.ui.container.WParameterLayout;
 
 /**
  * @author richer
@@ -39,10 +36,7 @@ public abstract class AccessDirection implements Direction {
 			return new int[] { x, y };
 		} else {
 			int posy = current_bounds.y;
-			if (posy >= designer.getParaHeight() && !designer.isFormParaDesigner()) {
+
-				return new int[] { x, y };
-			}
-			
 			Point relativePoint = getRelativePoint(x, y, current_bounds,designer);
 			sorptionPoint(relativePoint,current_bounds, designer);
 			return new int[] { relativePoint.x, relativePoint.y };
@@ -72,12 +66,14 @@ public abstract class AccessDirection implements Direction {
 
 		WAbsoluteLayout layout =getLayout(designer);
 		FormSelection selection = designer.getSelectionModel().getSelection();
+
+		boolean isWidgetsIntersect = false;
 		for (int i = 0, count = layout.getWidgetCount(); i < count; i++) {
 			BoundsWidget temp = (BoundsWidget) layout.getWidget(i);
 			if (!temp.isVisible() || selection.contains(temp.getWidget())) {
 				continue;
 			}
-			Rectangle bounds = temp.getBounds();
+			Rectangle bounds = getWidgetRelativeBounds(temp.getBounds(), selection);
 			if (!findInX) {
 				int x1 = bounds.x;
 				if (Math.abs(x1 - point.x) <= MoveUtils.SORPTION_UNIT) {
@@ -106,18 +102,54 @@ public abstract class AccessDirection implements Direction {
 			if (findInX && findInY) {
 				break;
 			}
+
+			if (current_bounds.intersects(bounds) && !(layout instanceof WParameterLayout)){
+				isWidgetsIntersect = true;
+			}
 		}
+		processRectangleIntersects(designer, point.x, point.y, isWidgetsIntersect);
 
 		designer.getStateModel().setXAbsorptionline(findInX && current_bounds.getWidth() > MoveUtils.SORPTION_UNIT ? Absorptionline.createXAbsorptionline(point.x) : null);
 		designer.getStateModel().setYAbsorptionline(findInY && current_bounds.getHeight() > MoveUtils.SORPTION_UNIT ? Absorptionline.createYAbsorptionline(point.y) : null);
 	}
 
+	private Rectangle getWidgetRelativeBounds(Rectangle bounds, FormSelection selection){
+		Rectangle relativeRec = new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
+		XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(selection.getSelectedCreator());
+		if (parent == null) {
+			return relativeRec;
+		}
+		Rectangle rec = ComponentUtils.getRelativeBounds(parent);
+		relativeRec.x += rec.x;
+		relativeRec.y += rec.y;
+		return relativeRec;
+	}
+
+	private void processRectangleIntersects(FormDesigner designer, int x, int y, boolean isIntersects){
+		if(isIntersects){
+			if(designer.getLocationOnScreen() != null) {
+				MoveUtils.displayForbidWindow(x + designer.getLocationOnScreen().x, y + designer.getLocationOnScreen().y);
+			}
+			designer.setWidgetsIntersect(true);
+		}
+		else{
+			MoveUtils.hideForbidWindow();
+			designer.setWidgetsIntersect(false);
+		}
+	}
+
     private WAbsoluteLayout getLayout(final FormDesigner designer){
         XLayoutContainer formLayoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(
                 designer.getTarget().getContainer());
         WAbsoluteLayout layout;
-        if (formLayoutContainer.acceptType(XWBorderLayout.class)){
+        if (formLayoutContainer.acceptType(XWBorderLayout.class)){//看起来这边的作用应该是为了区别cpt(得到XWParameterLayout)还是frm(得到XWBorderLayout)的参数界面
-            layout = (WAbsoluteLayout) designer.getParaComponent().toData();
+			Container container = designer.getSelectionModel().getSelection().getSelectedCreator().getParent();
+			if(container instanceof XWAbsoluteLayout){
+				layout = ((XWAbsoluteLayout)container).toData();
+			}
+			else {
+				layout = (WAbsoluteLayout) designer.getParaComponent().toData();
+			}
         } else{
             layout = (WAbsoluteLayout) designer.getTarget().getContainer();
         }

designer_form/src/com/fr/design/designer/beans/location/Inner.java

@@ -4,16 +4,17 @@ import com.fr.design.beans.location.Absorptionline;
 import com.fr.design.beans.location.MoveUtils;
 import com.fr.design.beans.location.MoveUtils.RectangleDesigner;
 import com.fr.design.beans.location.MoveUtils.RectangleIterator;
-import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.*;
-import com.fr.design.designer.creator.XLayoutContainer;
-import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
+import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.stable.ArrayUtils;
+import com.fr.third.com.lowagie.text.*;
 
 import java.awt.*;
+import java.awt.Rectangle;
 
 public class Inner extends AccessDirection {
 
@@ -78,17 +79,72 @@ public class Inner extends AccessDirection {
 			public RectangleIterator createRectangleIterator() {
 				return getRectangleIterator(designer);
 			}
+
+			/**
+			 * 设置designer内部组件是否重叠的标志位
+			 *
+			 * @param isIntersects 是否重叠
+			 */
+			@Override
+			public void setWidgetsIntersects(boolean isIntersects) {
+				designer.setWidgetsIntersect(isIntersects);
+			}
+
+			/**
+			 * 获取designer内部组件是否重叠的标志位
+			 *
+			 * @return 重叠
+			 */
+			@Override
+			public boolean getWidgetsIntersects() {
+				return designer.isWidgetsIntersect();
+			}
+
+			/**
+			 * 获取designer相对屏幕的位置
+			 *
+			 * @return 位置
+			 */
+			@Override
+			public Point getDesignerLocationOnScreen() {
+				return designer.getLocationOnScreen();
+			}
+
+			/**
+			 * 设置等距线
+			 *
+			 * @param line 吸附线
+			 */
+			@Override
+			public void setEquidistantLine(Absorptionline line) {
+				designer.getStateModel().setEquidistantLine(line);
+			}
 		};
-		point.setLocation(MoveUtils.sorption(point.x, point.y, current_bounds.width, current_bounds.height, rd));
+		//判断当前操作的是不是参数面板，要特殊处理
+		boolean isParameterLayout = ((XCreator)(designer.getSelectionModel().getSelection().getSelectedCreator().getParent())).acceptType(XWParameterLayout.class);
+		point.setLocation(MoveUtils.sorption(point.x, point.y, current_bounds.width, current_bounds.height, rd, isParameterLayout));
 	}
 	
 	private RectangleIterator getRectangleIterator(final FormDesigner designer){
+
 		return new RectangleIterator() {
 			private int i;
 			private WAbsoluteLayout layout = getLayout(designer);
 			private int count = layout.getWidgetCount();
 			private FormSelection selection = designer.getSelectionModel().getSelection();
 
+			private Rectangle getWidgetRelativeBounds(Rectangle bounds){
+				Rectangle relativeRec = new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
+				XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(selection.getSelectedCreator());
+				if (parent == null) {
+					return relativeRec;
+				}
+				Rectangle rec = ComponentUtils.getRelativeBounds(parent);
+				relativeRec.x += rec.x;
+				relativeRec.y += rec.y;
+				return relativeRec;
+			}
+
 			public boolean hasNext() {
 				if (i >= count) {
 					return false;
@@ -110,7 +166,7 @@ public class Inner extends AccessDirection {
 			}
 			public Rectangle nextRectangle() {
 				BoundsWidget temp = (BoundsWidget) layout.getWidget(i++);
-				return temp.getBounds();
+				return getWidgetRelativeBounds(temp.getBounds());
 			}
 		};
 	}
@@ -119,8 +175,14 @@ public class Inner extends AccessDirection {
         XLayoutContainer formLayoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(
                 designer.getTarget().getContainer());
         WAbsoluteLayout layout;
-        if (formLayoutContainer.acceptType(XWBorderLayout.class)){
+        if (formLayoutContainer.acceptType(XWBorderLayout.class)){//看起来这边的作用应该是为了区别cpt(得到XWParameterLayout)还是frm(得到XWBorderLayout)的参数界面
-            layout = (WAbsoluteLayout) designer.getParaComponent().toData();
+			Container container = designer.getSelectionModel().getSelection().getSelectedCreator().getParent();
+			if(container instanceof XWAbsoluteLayout){
+				layout = ((XWAbsoluteLayout)container).toData();
+			}
+			else {
+				layout = (WAbsoluteLayout) designer.getParaComponent().toData();
+			}
         } else{
             layout = (WAbsoluteLayout) designer.getTarget().getContainer();
         }

designer_form/src/com/fr/design/designer/beans/models/StateModel.java

@@ -44,6 +44,8 @@ public class StateModel {
 
 	private Absorptionline lineInX;
 	private Absorptionline lineInY;
+	//等距线
+	private Absorptionline lineEquidistant;
 
 	// 当前是否处于拖拽选择状态
 	private boolean selecting;
@@ -357,6 +359,14 @@ public class StateModel {
 		this.lineInY = line;
 	}
 
+	/**
+	 * 等距线赋值
+	 * @param line 线
+	 */
+	public void setEquidistantLine(Absorptionline line){
+		this.lineEquidistant = line;
+	}
+
     /**
      *画吸附线
      * @param g Graphics类
@@ -368,6 +378,9 @@ public class StateModel {
 		if(lineInY != null) {
 			lineInY.paint(g,designer.getArea());
 		}
+		if(lineEquidistant != null){
+			lineEquidistant.paint(g,designer.getArea());
+		}
 	}
 
     /**

designer_form/src/com/fr/design/designer/beans/painters/FRAbsoluteLayoutPainter.java

@@ -0,0 +1,26 @@
+package com.fr.design.designer.beans.painters;
+
+import com.fr.design.designer.creator.XLayoutContainer;
+
+import java.awt.*;
+
+/**
+ * Created by zhouping on 2016/7/11.
+ */
+public class FRAbsoluteLayoutPainter extends AbstractPainter {
+    public FRAbsoluteLayoutPainter(XLayoutContainer container) {
+        super(container);
+    }
+
+    /**
+     * 组件渲染
+     *
+     * @param g      画图类
+     * @param startX 开始位置x
+     * @param startY 开始位置y
+     */
+    @Override
+    public void paint(Graphics g, int startX, int startY) {
+        super.paint(g, startX, startY);
+    }
+}

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

@@ -91,7 +91,7 @@ public class XButton extends XWidgetCreator {
     protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{
        CRPropertyDescriptor[] crPropertyDescriptors = {
                new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(
-					   Inter.getLocText(new String[] {"Form-Button", "Name"})),
+					   Inter.getLocText(new String[] {"Form-Button", "Name"})).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
                        Inter.getLocText(new String[]{"Form-Button", "Style"})).setEditorClass(
                        ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
@@ -164,6 +164,7 @@ public class XButton extends XWidgetCreator {
 		return new CRPropertyDescriptor[]{
 			  new CRPropertyDescriptor("text", this.data.getClass())
 					  .setI18NName(Inter.getLocText(new String[] {"Form-Button", "Name"}))
+					  .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 					  .setPropertyChangeListener(new PropertyChangeAdapter() {
 
 						  @Override

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

@@ -32,6 +32,7 @@ public class XCheckBox extends XWidgetCreator {
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(Inter.getLocText("Text"))
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 						.setPropertyChangeListener(new PropertyChangeAdapter() {
 
 							@Override
@@ -41,6 +42,7 @@ public class XCheckBox extends XWidgetCreator {
 						}),
 				new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
 						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class)
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 						.setPropertyChangeListener(new PropertyChangeAdapter() {
 
 							@Override

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

@@ -34,35 +34,35 @@ public class XCheckBoxGroup extends XFieldEditor {
 
 	@Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), getCRPropertyDescriptor());
+		CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] {
-	}
-	
-	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class),
+						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class)
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(
 						Inter.getLocText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
-						DictionaryRenderer.class),
+						DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor());
+		CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor());
+		return	properties;
+	}
+
+	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
+		CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(Inter.getLocText("Adaptive"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class),
 				new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName(
 						Inter.getLocText(new String[]{"Provide", "Choose_All"})).putKeyValue(
 						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
-						Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
+						Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class)
-						XCreatorConstants.PROPERTY_CATEGORY, "Return-Value") };
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") };
 		if (((CheckBoxGroup) this.toData()).isReturnString()) {
 			crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] {
 					new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
-							Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+							Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-							"Return-Value"),
 					new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
-							Inter.getLocText("ComboCheckBox-Start_Symbol")).putKeyValue(
+							Inter.getLocText("ComboCheckBox-Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-							XCreatorConstants.PROPERTY_CATEGORY, "Return-Value"),
 					new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(
-							Inter.getLocText("ComboCheckBox-End_Symbol")).putKeyValue(
+							Inter.getLocText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") });
-							XCreatorConstants.PROPERTY_CATEGORY, "Return-Value") });
 		}
 		if (!((CheckBoxGroup) this.toData()).isAdaptive()) {
 			crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data

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

@@ -10,6 +10,7 @@ import java.beans.IntrospectionException;
 
 import javax.swing.JComponent;
 
+import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.widget.editors.DictionaryEditor;
@@ -38,11 +39,11 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor {
     @Override
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
         return (CRPropertyDescriptor[]) ArrayUtils.addAll(
-            super.supportedDescriptor(),
+				new CRPropertyDescriptor[]{
-            new CRPropertyDescriptor[]{
+						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-            	new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class),
+						new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class)
-                new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class)
+								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
-            });
+				}, super.supportedDescriptor());
     }
 
     @Override

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

@@ -32,20 +32,20 @@ public class XComboCheckBox extends XComboBox {
 						Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 						"Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass(
-						InChangeBooleanEditor.class).setI18NName(Inter.getLocText("Return-String")).putKeyValue(
+						InChangeBooleanEditor.class).setI18NName(Inter.getLocText("Return-String"))
-						XCreatorConstants.PROPERTY_CATEGORY, "Return-Value") } : new CRPropertyDescriptor[] {
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
 						Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 						"Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
-						Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
+						Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class)
-						XCreatorConstants.PROPERTY_CATEGORY, "Return-Value"),
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
-						Inter.getLocText("ComboCheckBox-Start_Symbol")).putKeyValue(
+						Inter.getLocText("ComboCheckBox-Start_Symbol"))
-						XCreatorConstants.PROPERTY_CATEGORY, "Return-Value"),
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(
-						Inter.getLocText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+						Inter.getLocText("ComboCheckBox-End_Symbol"))
-						"Return-Value") });
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") });
 	}
 
     @Override

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

@@ -1 +1 @@
-package com.fr.design.designer.creator;

import com.fr.form.ui.WriteAbleRepeatEditor;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;

import java.awt.*;
import java.beans.IntrospectionException;

/**
 * Author : Shockway
 * Date: 13-9-22
 * Time: 上午10:40
 */
public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor {
	public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) {
		super(widget, initSize);
	}

	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
				new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData",
						this.data.getClass()).setI18NName(Inter.getLocText("Form-Allow_CustomData"))});
	}
}
+package com.fr.design.designer.creator;

import com.fr.design.form.util.XCreatorConstants;
import com.fr.form.ui.WriteAbleRepeatEditor;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;

import java.awt.*;
import java.beans.IntrospectionException;

/**
 * Author : Shockway
 * Date: 13-9-22
 * Time: 上午10:40
 */
public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor {
	public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) {
		super(widget, initSize);
	}

	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
				new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData",
						this.data.getClass()).setI18NName(Inter.getLocText("Form-Allow_CustomData"))
						.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")});
	}
}

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

@@ -46,17 +46,20 @@ public class XDateEditor extends XDirectWriteEditor {
      */
     @Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
+		CRPropertyDescriptor [] tempt=(CRPropertyDescriptor[]) ArrayUtils.addAll(
 				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
 								Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
-								WidgetValueEditor.class).setPropertyChangeListener(new PropertyChangeAdapter() {
+								WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-									
+								"Advanced").setPropertyChangeListener(new PropertyChangeAdapter() {
-									@Override
+
-									public void propertyChange() {
+							@Override
-										initFieldText();
+							public void propertyChange() {
-									}
+								initFieldText();
-								}),
+							}
+						})},super.supportedDescriptor());
+		return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt,
+				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName(
 								Inter.getLocText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass(
 								DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
@@ -66,11 +69,11 @@ public class XDateEditor extends XDirectWriteEditor {
 						new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName(
 								Inter.getLocText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 								"Advanced").setEditorClass(DateRangeEditor.class),
-						new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName(
-								Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								"Return-Value"),
 						new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
 								Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+								"Advanced"),
+						new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName(
+								Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 								"Advanced")
 				});
 	}

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

@@ -6,6 +6,7 @@ package com.fr.design.designer.creator;
 import java.awt.Dimension;
 import java.beans.IntrospectionException;
 
+import com.fr.design.form.util.XCreatorConstants;
 import com.fr.form.ui.DirectWriteEditor;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
@@ -24,6 +25,7 @@ public abstract class XDirectWriteEditor extends XFieldEditor {
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
 				new CRPropertyDescriptor[] { new CRPropertyDescriptor("directEdit", this.data.getClass())
-								.setI18NName(Inter.getLocText("Form-Allow_Edit")) });
+								.setI18NName(Inter.getLocText("Form-Allow_Edit")).putKeyValue(
+								 XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") });
 	}
 }

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

@@ -22,8 +22,8 @@ import com.fr.stable.ArrayUtils;
  */
 public abstract class XFieldEditor extends XWidgetCreator {
 
-	protected static final Border FIELDBORDER = BorderFactory.createLineBorder(new Color(128, 152, 186), 1);
+    protected static final Border FIELDBORDER = BorderFactory.createLineBorder(new Color(128, 152, 186), 1);
-	
+
     public XFieldEditor(FieldEditor widget, Dimension initSize) {
         super(widget, initSize);
     }
@@ -31,22 +31,22 @@ public abstract class XFieldEditor extends XWidgetCreator {
     @Override
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
         return (CRPropertyDescriptor[]) ArrayUtils.addAll(
-                super.supportedDescriptor(),getCRPropertyDescriptor()
+                super.supportedDescriptor(), getCRPropertyDescriptor()
-               );
+        );
     }
 
-	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
+    private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
+        CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
-								Inter.getLocText("Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
+                Inter.getLocText("Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
-								XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
+                XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
-		CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName(
+        CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName(
-								Inter.getLocText("Verify-Message"))
+                Inter.getLocText("Verify-Message"))
-								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
+                .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
-		CRPropertyDescriptor fontSize = new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize")
+        CRPropertyDescriptor fontSize = new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize")
-								.setI18NName(Inter.getLocText(new String[]{"FRFont", "FRFont-Size"}))
+                .setI18NName(Inter.getLocText(new String[]{"FRFont", "FRFont-Size"}))
-								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
+                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
-		return !((FieldEditor) toData()).isAllowBlank() ?
+        return !((FieldEditor) toData()).isAllowBlank() ?
-				new CRPropertyDescriptor[] {allowBlank, blankErrorMsg, fontSize}
+                new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize}
-				: new CRPropertyDescriptor[] {allowBlank, fontSize};
+                : new CRPropertyDescriptor[]{allowBlank, fontSize};
-	}
+    }
 }

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

@@ -59,7 +59,7 @@ public class XLabel extends XWidgetCreator {
 				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
 								Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(
-								WidgetValueEditor.class),
+								WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 						new CRPropertyDescriptor("wrap", this.data.getClass()).setI18NName(
 								Inter.getLocText("FR-Designer_StyleAlignment-Wrap_Text")).putKeyValue(
 								XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),

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

@@ -41,31 +41,42 @@ public class XNumberEditor extends XWrapperedFieldEditor {
      */
     @Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor[] sup = super.supportedDescriptor();
+		CRPropertyDescriptor[] sup =(CRPropertyDescriptor[]) ArrayUtils.addAll(
+				new CRPropertyDescriptor[] {
+						new CRPropertyDescriptor("widgetValue", this.data.getClass())
+						.setI18NName(Inter.getLocText(new String[]{"Widget", "Value"}))
+						.setEditorClass(WidgetValueEditor.class)
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}
+				,super.supportedDescriptor());
 		CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass())
 				.setEditorClass(InChangeBooleanEditor.class)
-				.setI18NName(Inter.getLocText("FR-Designer_Allow_Decimals"));
+				.setI18NName(Inter.getLocText("FR-Designer_Allow_Decimals"))
+				.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
 		CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass())
-				.setI18NName(Inter.getLocText(new String[]{"Double", "Numbers"}));
+				.setI18NName(Inter.getLocText(new String[]{"Double", "Numbers"}))
+				.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
 		sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ?
 				new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal});
 		return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
 				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("allowNegative", this.data.getClass())
 								.setI18NName(Inter.getLocText("FR-Designer_Allow_Negative"))
-								.setEditorClass(InChangeBooleanEditor.class),
+								.setEditorClass(InChangeBooleanEditor.class)
+								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
 						new CRPropertyDescriptor("minValue", this.data.getClass())
 								.setI18NName(Inter.getLocText("FR-Designer_Min_Value"))
-								.setEditorClass(SpinnerMinNumberEditor.class),
+								.setEditorClass(SpinnerMinNumberEditor.class)
+								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
 						new CRPropertyDescriptor("maxValue", this.data.getClass())
 								.setI18NName(Inter.getLocText("FR-Designer_Max_Value"))
-								.setEditorClass(SpinnerMaxNumberEditor.class),
+								.setEditorClass(SpinnerMaxNumberEditor.class)
-						new CRPropertyDescriptor("widgetValue", this.data.getClass())
+								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
-								.setI18NName(Inter.getLocText(new String[]{"Widget", "Value"}))
-								.setEditorClass(WidgetValueEditor.class),
 						new CRPropertyDescriptor("waterMark", this.data.getClass())
 								.setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
-								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+						new CRPropertyDescriptor("regErrorMessage", this.data.getClass())
+								.setI18NName(Inter.getLocText("Verify-Message"))
+								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")
 				});
 	}
 

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

@@ -47,16 +47,19 @@ public class XPassword extends XWrapperedFieldEditor {
      */
 	@Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
+		CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(
 				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
 								Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
-								WidgetValueEditor.class),
+								WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}
+							, super.supportedDescriptor());
+		return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
+				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("regex", this.data.getClass())
 								.setI18NName(Inter.getLocText("FR-Designer_Input_Rule"))
 								.setEditorClass(RegexEditor.RegexEditor4TextArea.class)
 								.putKeyValue("renderer", RegexCellRencerer.class)
-								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
 						new CRPropertyDescriptor("waterMark", this.data.getClass())
 								.setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
 								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")

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

@@ -39,16 +39,19 @@ public class XRadioGroup extends XFieldEditor {
 
 	@Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),getCRPropertyDescriptor());
+		CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] {
-	}
-	
-	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class),
+						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class)
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(
 						Inter.getLocText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
-						DictionaryRenderer.class),
+						DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor());
+		CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor());
+		return properties;
+	}
+
+	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
+		CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(Inter.getLocText("Adaptive"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)};
 		if (!toData().isAdaptive()) {

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

@@ -36,15 +36,16 @@ public class XTextArea extends XFieldEditor {
 
 	@Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
+		CRPropertyDescriptor[] sup=(CRPropertyDescriptor[]) ArrayUtils.addAll(
+				new CRPropertyDescriptor[] {
+				new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
+						Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
+						WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor());
+		return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
 				new CRPropertyDescriptor[] {
-						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-								Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(
-								WidgetValueEditor.class),
 						new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
 								Inter.getLocText("Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class)
-								.putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(
+								.putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
-										XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 						new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
 								Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 								"Advanced"), });

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

@@ -18,10 +18,12 @@ import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.reg.RegExp;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
+import com.fr.stable.StringUtils;
 
 /**
  * @author richer
@@ -35,43 +37,53 @@ public class XTextEditor extends XWrapperedFieldEditor {
 
     /**
      * 控件的属性列表
+     *
      * @return 此控件所用的属性列表
      * @throws IntrospectionException 异常
      */
     @Override
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
+        CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-				new CRPropertyDescriptor[] {
+                Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(
-						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
+                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
-								Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(
+        CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
-								WidgetValueEditor.class),
+                Inter.getLocText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue(
-						new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
+                "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
-								Inter.getLocText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue(
+        CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
-								"renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                Inter.getLocText("Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
-								"Advanced"),
+        CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
-						new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
+                Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-								Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+                "Advanced");
-								"Advanced"), });
+        CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor());
-	}
+        Boolean displayRegField = true;
-    
+        RegExp reg = ((TextEditor) toData()).getRegex();
-	@Override
+        if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
-	public void paintComponent(Graphics g) {
-		super.paintComponent(g);
 
-		TextEditor area = (TextEditor) data;
+            displayRegField = false;
-		if (area.getWidgetValue() != null) {
+        }
-			Graphics2D g2d = (Graphics2D) g.create();
+        return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
-			BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), area.getWidgetValue()
+                new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
-					.toString(), Style.getInstance(FRFont.getInstance()).deriveHorizontalAlignment(Constants.LEFT)
+                (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
-					.deriveTextStyle(Style.TEXTSTYLE_SINGLELINE), ScreenResolution.getScreenResolution());
+    }
-		}
+
-	}
+    @Override
+    public void paintComponent(Graphics g) {
+        super.paintComponent(g);
+
+        TextEditor area = (TextEditor) data;
+        if (area.getWidgetValue() != null) {
+            Graphics2D g2d = (Graphics2D) g.create();
+            BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), area.getWidgetValue()
+                    .toString(), Style.getInstance(FRFont.getInstance()).deriveHorizontalAlignment(Constants.LEFT)
+                    .deriveTextStyle(Style.TEXTSTYLE_SINGLELINE), ScreenResolution.getScreenResolution());
+        }
+    }
 
     @Override
-	protected JComponent initEditor() {
+    protected JComponent initEditor() {
-		setBorder(FIELDBORDER);
+        setBorder(FIELDBORDER);
-		return this;
+        return this;
-	}
+    }
 
     @Override
     protected String getIconName() {

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

@@ -53,13 +53,13 @@ public class XTreeComboBoxEditor extends XTreeEditor {
 	protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{
 		return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("directEdit", this.data.getClass())
           .setI18NName(Inter.getLocText("Form-Allow_Edit")).putKeyValue(
-                  XCreatorConstants.PROPERTY_CATEGORY, "Advanced"));
+                  XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"));
 	}
 
 	protected CRPropertyDescriptor[] addCustomData(CRPropertyDescriptor[] crp) throws IntrospectionException{
 		return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("customData", this.data.getClass())
           .setI18NName(Inter.getLocText("Form-Allow_CustomData")).putKeyValue(
-                  XCreatorConstants.PROPERTY_CATEGORY, "Advanced"));
+                  XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"));
 	}
 
     @Override

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

@@ -41,26 +41,28 @@ public class XTreeEditor extends XWidgetCreator {
         CRPropertyDescriptor[] crp = !((FieldEditor) toData()).isAllowBlank() ?
                 new CRPropertyDescriptor[]{
                         new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-                                Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(WidgetValueEditor.class),
+                                Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(WidgetValueEditor.class)
+                                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName(
                                 Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
-                                TreeModelRenderer.class),
+                                TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
-                                Inter.getLocText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
+                                Inter.getLocText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class)
-                                XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+                                .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
                         new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName(
                                 Inter.getLocText("FR-Designer_Verify-Message"))
-                                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+                                .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
                 }
                 : new CRPropertyDescriptor[]{
                 new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
-                        Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(WidgetValueEditor.class),
+                        Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(WidgetValueEditor.class)
+                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName(
                         Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
-                        TreeModelRenderer.class),
+                        TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
                         Inter.getLocText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
-                        XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),};
+                        XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),};
 
 		crp = this.addWaterMark(crp);
 		crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp,

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

@@ -3,26 +3,45 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.Dimension;
+import java.awt.*;
-import java.awt.Graphics;
-import java.awt.Rectangle;
 import java.awt.event.ContainerEvent;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.beans.IntrospectionException;
 import java.util.HashMap;
 
+import com.fr.design.designer.beans.AdapterBus;
+import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.LayoutAdapter;
+import com.fr.design.designer.beans.adapters.layout.AbsoluteLayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRAbsoluteLayoutAdapter;
 import com.fr.design.designer.beans.location.Direction;
+import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.form.layout.FRAbsoluteLayout;
+import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.icon.IconPathConstants;
+import com.fr.design.mainframe.EditingMouseListener;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
+import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
+import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.form.ui.Connector;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+import com.fr.stable.core.PropertyChangeAdapter;
 
 /**
  * @author richer
  * @since 6.5.3
  */
 public class XWAbsoluteLayout extends XLayoutContainer {
+
+	private static final int EDIT_BTN_WIDTH = 60;
+	private static final int EDIT_BTN_HEIGHT = 24;
 	
 	private HashMap<Connector,XConnector> xConnectorMap;
 	
@@ -93,7 +112,17 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	protected void initLayoutManager() {
 		this.setLayout(new FRAbsoluteLayout());
 	}
-	
+
+	/**
+	 * 是否支持标题样式
+	 *
+	 * @return 默认false
+	 */
+	@Override
+	public boolean hasTitleStyle() {
+		return false;
+	}
+
 	@Override
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
@@ -158,7 +187,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		WAbsoluteLayout wabs = this.toData();
 		if (!creator.acceptType(XWFitLayout.class)) {
 			creator.setDirections(Direction.ALL);		
-		}	
+		}
 		wabs.addWidget(new BoundsWidget(creator.toData(), creator.getBounds()));
 	}
 	
@@ -187,4 +216,86 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	public LayoutAdapter getLayoutAdapter() {
 		return new FRAbsoluteLayoutAdapter(this);
 	}
+
+	@Override
+	public XLayoutContainer getTopLayout() {
+		XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
+		if (xTopLayout != null && !xTopLayout.isEditable()){
+			return xTopLayout;
+		}
+		else{
+			return this;
+		}
+	}
+
+	/**
+	 *  得到属性名
+	 * @return 属性名
+	 * @throws java.beans.IntrospectionException
+	 */
+	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+		return  new CRPropertyDescriptor[] {
+				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(
+						Inter.getLocText("FR-Designer_Form-Widget_Name"))
+		};
+	}
+
+	public void paint(Graphics g) {
+		super.paint(g);
+		//如果鼠标移动到布局内且布局不可编辑，画出编辑蒙层
+		if (isMouseEnter && !this.editable) {
+			int x = 0;
+			int y = 0;
+			int w = getWidth();
+			int h = getHeight();
+
+			Graphics2D g2d = (Graphics2D) g;
+			Composite oldComposite = g2d.getComposite();
+			//画白色的编辑层
+			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F));
+			g2d.setColor(Color.WHITE);
+			g2d.fillRect(x, y, w, h);
+			//画编辑按钮所在框
+			g2d.setComposite(oldComposite);
+			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);
+			g2d.drawImage(
+					image,
+					(x + w / 2 - 23),
+					(y + h / 2 - image.getHeight() / 2),
+					image.getWidth(),
+					image.getHeight(),
+					null,
+					this
+			);
+			g2d.setColor(Color.BLACK);
+			//画编辑文字
+			g2d.drawString(Inter.getLocText("Edit"), x + w / 2 - 2, y + h / 2 + 5);
+		}
+	}
+
+	/**
+	 * 响应点击事件
+	 *
+	 * @param editingMouseListener 鼠标点击，位置处理器
+	 * @param e 鼠标点击事件
+	 */
+	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+		FormDesigner designer = editingMouseListener.getDesigner();
+		SelectionModel selectionModel = editingMouseListener.getSelectionModel();
+		boolean isEditing = isEditable() || designer.getCursor().getType() == Cursor.HAND_CURSOR || e.getClickCount() == 2;
+		setEditable(isEditing);
+
+		selectionModel.selectACreatorAtMouseEvent(e);
+		designer.repaint();
+
+		if (editingMouseListener.stopEditing()) {
+			if (this != designer.getRootComponent()) {
+				ComponentAdapter adapter = AdapterBus.getComponentAdapter(designer, this);
+				editingMouseListener.startEditing(this, isEditing ? adapter.getDesignerEditor() : null, adapter);
+			}
+		}
+	}
 }

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

@@ -1,20 +0,0 @@
-package com.fr.design.designer.creator;
-
-import com.fr.design.designer.beans.LayoutAdapter;
-import com.fr.design.designer.beans.adapters.layout.FRBodyFitLayoutAdapter;
-import com.fr.form.ui.container.WFitLayout;
-import java.awt.Dimension;
-
-public class XWBodyFitLayout extends XWFitLayout {
-	public XWBodyFitLayout() {
-		this(new WFitLayout(), new Dimension());
-	}
-
-	public XWBodyFitLayout(WFitLayout widget, Dimension initSize) {
-		super(widget, initSize);
-	}
-	@Override
-	public LayoutAdapter getLayoutAdapter() {
-		return new FRBodyFitLayoutAdapter(this);
-	}
-}

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

@@ -51,7 +51,7 @@ public class XWFitLayout extends XLayoutContainer {
 	
 	public XWFitLayout(WFitLayout widget, Dimension initSize) {
 		super(widget, initSize);
-		
+
 		initPercent();
 	}
 	
@@ -825,7 +825,7 @@ public class XWFitLayout extends XLayoutContainer {
     
     /**
      * 处理自适应布局的directions
-     * @param creator 组件
+     * @param xcreator 组件
      */
     private void dealDirections(XCreator xcreator, boolean isInit) {
     	if (xcreator == null) {
@@ -1160,7 +1160,7 @@ public class XWFitLayout extends XLayoutContainer {
 
 	@Override
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-		return new WidgetPropertyUIProvider[]{ new BodyMobilePropertyUI(new XWBodyFitLayout())};
+		return new WidgetPropertyUIProvider[]{ new BodyMobilePropertyUI(this)};
 	}
 	
 }

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

@@ -3,6 +3,7 @@
  */
 package com.fr.design.designer.creator;
 
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRParameterLayoutAdapter;
 import com.fr.design.form.util.XCreatorConstants;
@@ -16,9 +17,12 @@ import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.general.Background;
 import com.fr.general.Inter;
+import com.fr.design.fun.ParameterWindowEditorProcessor;
+import com.fr.stable.ArrayUtils;
 
 import java.awt.*;
 import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
 
 /**
  * 表单参数界面container
@@ -51,7 +55,7 @@ public class XWParameterLayout extends XWAbsoluteLayout {
      * @throws java.beans.IntrospectionException
      */
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-        return  new CRPropertyDescriptor[]{
+        CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
                         .getLocText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class)
@@ -61,9 +65,17 @@ public class XWParameterLayout extends XWAbsoluteLayout {
                         .setI18NName(Inter.getLocText("FR-Designer_DisplayNothingBeforeQuery"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class)
-                     .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(Inter.getLocText("FR-Designer_WidgetDisplyPosition"))
+                        .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(Inter.getLocText("FR-Designer_WidgetDisplyPosition"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
         };
+
+        ParameterWindowEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(ParameterWindowEditorProcessor.MARK_STRING);
+        if (processor == null) {
+            return  propertyTableEditor;
+        }
+        CRPropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass());
+
+        return ArrayUtils.addAll(propertyTableEditor, extraEditor);
     }
     
 	@Override
@@ -151,4 +163,15 @@ public class XWParameterLayout extends XWAbsoluteLayout {
     public void setBackground(Background background){
         this.toData().setBackground(background);
     }
+
+    @Override
+    public void paint(Graphics g) {
+        //参数面板特殊处理，不出现编辑层
+        setEditable(true);
+        super.paint(g);
+    }
+    @Override
+    public XLayoutContainer getTopLayout() {
+        return this;
+    }
 }

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

@@ -219,8 +219,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * 
 	 */
 	protected void setWrapperName(XLayoutContainer parentPanel, String widgetName) {
-		//先随便set一个, 以后还是要隐藏的
+		parentPanel.toData().setWidgetName("tablayout" + widgetName.replaceAll(createDefaultName(),""));
-		parentPanel.toData().setWidgetName("border_card_" + widgetName);
 	}
 	
 	/**

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

@@ -11,6 +11,7 @@ import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
 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.XWBorderLayout;
 import com.fr.design.icon.IconPathConstants;
@@ -263,6 +264,12 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 	 */
 	@Override
 	public XLayoutContainer getTopLayout() {
-		return this;
+		XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
+		if (xTopLayout != null && !xTopLayout.isEditable()){
+			return xTopLayout;
+		}
+		else{
+			return this;
+		}
 	}
 }

designer_form/src/com/fr/design/designer/properties/AbsoluteStateRenderer.java

@@ -0,0 +1,12 @@
+package com.fr.design.designer.properties;
+
+import com.fr.design.mainframe.widget.renderer.EncoderCellRenderer;
+
+/**
+ * Created by zhouping on 2016/8/1.
+ */
+public class AbsoluteStateRenderer extends EncoderCellRenderer {
+    public AbsoluteStateRenderer() {
+        super(new AbsoluteStateWrapper());
+    }
+}

designer_form/src/com/fr/design/designer/properties/AbsoluteStateWrapper.java

@@ -0,0 +1,12 @@
+package com.fr.design.designer.properties;
+
+import com.fr.design.designer.properties.items.FRAbsoluteConstraintsItems;
+
+/**
+ * Created by zhouping on 2016/8/1.
+ */
+public class AbsoluteStateWrapper extends ItemWrapper{
+    public AbsoluteStateWrapper() {
+        super(new FRAbsoluteConstraintsItems());
+    }
+}

designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java

@@ -1,40 +1,39 @@
 package com.fr.design.designer.properties;
 
 import java.awt.event.MouseEvent;
+import java.beans.IntrospectionException;
 import java.util.ArrayList;
-
-import javax.swing.JTable;
-import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 
-import com.fr.design.beans.GroupModel;
+import com.fr.base.FRContext;
+import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
+import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.itable.AbstractPropertyTable;
 import com.fr.design.gui.itable.PropertyGroup;
-import com.fr.design.designer.beans.LayoutAdapter;
+import com.fr.design.gui.xtable.ReportAppPropertyGroupModel;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
+import com.fr.general.Inter;
 
 
 public class BodyAppRelayoutTable extends AbstractPropertyTable {
 
-	private XWBodyFitLayout xwBodyFitLayout;
+	private XCreator xCreator;
+	private FormDesigner designer;
 
-	public BodyAppRelayoutTable(XWBodyFitLayout xwBodyFitLayout) {
+	public BodyAppRelayoutTable(XCreator xCreator) {
-		super();
+		this.xCreator = xCreator;
-		setDesigner(xwBodyFitLayout);
 	}
 	
-	public static ArrayList<PropertyGroup> getCreatorPropertyGroup(XCreator source) {
+	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		ArrayList<PropertyGroup> groups = new ArrayList<PropertyGroup>();
+		CRPropertyDescriptor[] propertyTableEditor = {
-		if (source instanceof XLayoutContainer) {
+				new CRPropertyDescriptor("appRelayout", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class)
-			LayoutAdapter layoutAdapter = ((XLayoutContainer)source).getLayoutAdapter();
+						.setI18NName(Inter.getLocText("FR-Designer-App_ReLayout"))
-			if(layoutAdapter != null){
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"))
-				GroupModel m = layoutAdapter.getLayoutProperties();
+		};
-				if (m != null) {
+		return propertyTableEditor;
-					groups.add(new PropertyGroup(m));
-				}
-			}
-		}
-		return groups;
 	}
 
     /**
@@ -43,20 +42,24 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
      */
 	public void initPropertyGroups(Object source) {
 
-		groups = getCreatorPropertyGroup(xwBodyFitLayout);
+		this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+
+		groups = new ArrayList<PropertyGroup>();
+		CRPropertyDescriptor[] propertyTableEditor = null;
+
+		try {
+			propertyTableEditor = supportedDescriptor();
+		}catch (IntrospectionException e) {
+			FRContext.getLogger().error(e.getMessage());
+		}
+
+		groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), xCreator, propertyTableEditor, designer)));
 
 		TableModel model = new BeanTableModel();
 		setModel(model);
-		this.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
-		TableColumn tc = this.getColumn(this.getColumnName(0));
-		tc.setPreferredWidth(30);
 		this.repaint();
 	}
 
-	private void setDesigner(XWBodyFitLayout xwBodyFitLayout) {
-		this.xwBodyFitLayout = xwBodyFitLayout;
-	}
-
 
 	/**
 	 * 单元格tooltip
@@ -78,6 +81,6 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
      * 待说明
      */
 	public void firePropertyEdit() {
-
+		designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
 	}
 }

designer_form/src/com/fr/design/designer/properties/BodyMobileLayoutPropertiesGroupModel.java

@@ -1,111 +0,0 @@
-package com.fr.design.designer.properties;
-
-import com.fr.design.beans.GroupModel;
-import com.fr.form.ui.container.WFitLayout;
-import com.fr.design.designer.creator.XWFitLayout;
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.mainframe.widget.editors.BooleanEditor;
-import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import java.awt.*;
-
-public class BodyMobileLayoutPropertiesGroupModel implements GroupModel {
-	private PropertyCellEditor reLayoutEditor;
-	private CheckBoxCellRenderer reLayoutrenderer;
-	private WFitLayout layout;
-	private XWFitLayout xfl;
-
-	public BodyMobileLayoutPropertiesGroupModel(XWFitLayout xfl) {
-		this.xfl = xfl;
-		this.layout = xfl.toData();
-		reLayoutrenderer = new CheckBoxCellRenderer();
-		reLayoutEditor = new PropertyCellEditor(new BooleanEditor());
-	}
-
-	@Override
-	public String getGroupName() {
-		return Inter.getLocText("FR-Designer-Layout_Adaptive_Layout");
-	}
-
-	@Override
-	public int getRowCount() {
-		return 1;
-	}
-
-	@Override
-	public TableCellRenderer getRenderer(int row) {
-		return reLayoutrenderer;
-	}
-
-	@Override
-	public TableCellEditor getEditor(int row) {
-		return reLayoutEditor;
-	}
-
-	@Override
-	public Object getValue(int row, int column) {
-		if (column == 0) {
-			return Inter.getLocText("FR-Designer-App_ReLayout");
-		}else {
-			return layout.getAppRelayout();
-		}
-	}
-
-	@Override
-	public boolean setValue(Object value, int row, int column) {
-		int state = 0;
-		boolean appRelayoutState = true;
-		if(value instanceof Integer) {
-			state = (Integer)value;
-		}else if (value instanceof Boolean) {
-			appRelayoutState = (boolean)value;
-		}
-		if (column == 0 || state < 0) {
-			return false;
-		} else {
-			layout.setAppRelayout(appRelayoutState);
-			return true;
-		}
-	}
-
-	/**
-	 * 是否可编辑
-	 * @param row 行
-	 * @return 否
-	 */
-	@Override
-	public boolean isEditable(int row) {
-		return true;
-	}
-
-	private class CheckBoxCellRenderer extends UICheckBox implements TableCellRenderer {
-
-
-		public CheckBoxCellRenderer() {
-			super();
-			setOpaque(true);
-
-		}
-
-		public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-			if (value instanceof Boolean) {
-				setSelected(((Boolean) value).booleanValue());
-				setEnabled(table.isCellEditable(row, column));
-				if (isSelected) {
-					setBackground(table.getSelectionBackground());
-					setForeground(table.getSelectionForeground());
-				} else {
-					setForeground(table.getForeground());
-					setBackground(table.getBackground());
-				}
-			} else {
-				return null;
-			}
-			return this;
-		}
-	}
-}

designer_form/src/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java

@@ -0,0 +1,94 @@
+package com.fr.design.designer.properties;
+
+import com.fr.design.beans.GroupModel;
+import com.fr.design.designer.creator.XWAbsoluteLayout;
+import com.fr.design.mainframe.widget.editors.AbsoluteLayoutDirectionEditor;
+import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor;
+import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
+import com.fr.form.ui.container.WAbsoluteLayout;
+import com.fr.general.Inter;
+
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+
+/**
+ * Created by zhouping on 2016/8/1.
+ */
+public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel {
+
+    private PropertyCellEditor editor;
+    private DefaultTableCellRenderer renderer;
+    private AbsoluteLayoutDirectionEditor stateEditor;
+    private AbsoluteStateRenderer stateRenderer;
+    private WAbsoluteLayout layout;
+    private XWAbsoluteLayout xwAbsoluteLayout;
+
+    public FRAbsoluteLayoutPropertiesGroupModel(XWAbsoluteLayout xwAbsoluteLayout){
+        this.xwAbsoluteLayout = xwAbsoluteLayout;
+        this.layout = xwAbsoluteLayout.toData();
+        renderer = new DefaultTableCellRenderer();
+        editor = new PropertyCellEditor(new IntegerPropertyEditor());
+        stateEditor = new AbsoluteLayoutDirectionEditor();
+        stateRenderer = new AbsoluteStateRenderer();
+    }
+
+    /**
+     * 布局管理器自己的属性
+     */
+    @Override
+    public String getGroupName() {
+        return Inter.getLocText("FR-Designer-Widget_Area_Scaling");
+    }
+
+    @Override
+    public int getRowCount() {
+        return 1;
+    }
+
+    @Override
+    public TableCellRenderer getRenderer(int row) {
+        return stateRenderer;
+    }
+
+    @Override
+    public TableCellEditor getEditor(int row) {
+        return stateEditor;
+    }
+
+    @Override
+    public Object getValue(int row, int column) {
+        if (column == 0) {
+            return Inter.getLocText("FR-Designer-Widget_Scaling_Mode");
+        } else {
+            return layout.getCompState();
+        }
+    }
+
+    @Override
+    public boolean setValue(Object value, int row, int column) {
+        int state = 0;
+        if(value instanceof Integer) {
+            state = (Integer)value;
+        }
+        if (column == 0 || state < 0) {
+            return false;
+        } else {
+            if (row == 0) {
+                layout.setCompState(state);
+                return true;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 是否可编辑
+     * @param row 行
+     * @return 否
+     */
+    @Override
+    public boolean isEditable(int row) {
+        return true;
+    }
+}

designer_form/src/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java

@@ -0,0 +1,19 @@
+package com.fr.design.designer.properties.items;
+
+import com.fr.form.ui.container.WAbsoluteLayout;
+import com.fr.general.Inter;
+
+/**
+ * Created by zhouping on 2016/8/1.
+ */
+public class FRAbsoluteConstraintsItems implements ItemProvider{
+
+    public static final Item[] ITEMS = new Item[] {
+            new Item(Inter.getLocText("FR-Designer_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT),
+            new Item(Inter.getLocText("FR-Designer_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED)
+    };
+
+    public Item[] getItems() {
+        return ITEMS;
+    }
+}

designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java

@@ -1,7 +1,7 @@
 package com.fr.design.designer.properties.mobile;
 
 import com.fr.design.designer.creator.XCreator;
-import com.fr.design.designer.creator.XWBodyFitLayout;
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.properties.BodyAppRelayoutTable;
 import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
 import com.fr.design.gui.itable.AbstractPropertyTable;
@@ -14,13 +14,13 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
 
     private XCreator xCreator;
 
-    public BodyMobilePropertyUI(XWBodyFitLayout xWBodyFitLayout) {
+    public BodyMobilePropertyUI(XWFitLayout xwFitLayout) {
-        this.xCreator = xWBodyFitLayout;
+        this.xCreator = xwFitLayout;
     }
 
     @Override
     public AbstractPropertyTable createWidgetAttrTable() {
-        return new BodyAppRelayoutTable((XWBodyFitLayout) xCreator);
+        return new BodyAppRelayoutTable(xCreator);
     }
 
     @Override

designer_form/src/com/fr/design/form/util/XCreatorConstants.java

@@ -21,6 +21,7 @@ public class XCreatorConstants {
     // 描述属性的分类
     public static final String PROPERTY_CATEGORY = "category";
     public static final String DEFAULT_GROUP_NAME = "Form-Basic_Properties";
+    public static final String PROPERTY_VALIDATE = "validate";
     public static final Color FORM_BG = new Color(252, 252, 254);
     // 拖拽标识块的大小
     public static final int RESIZE_BOX_SIZ = 5;

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<? extends Widget> 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};
    }

	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);
}
+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<? extends Widget> 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);
}

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

@@ -10,6 +10,7 @@ import javax.swing.*;
 import javax.swing.event.MouseInputAdapter;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.beans.location.MoveUtils;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.events.DesignerEditor;
@@ -72,6 +73,9 @@ public class EditingMouseListener extends MouseInputAdapter {
 	private DesignerEditor<? extends JComponent> current_editor;
 	private XCreator current_creator;
 
+	//备份开始拖动的位置和大小
+	private Rectangle dragBackupBounds;
+
 	/**
 	 * 获取最小移动距离
 	 * 
@@ -189,6 +193,14 @@ public class EditingMouseListener extends MouseInputAdapter {
 			if (stateModel.isDragging()) {
                 // 当前鼠标所在的组件
                 XCreator hoveredComponent = designer.getComponentAt(e.getX(), e.getY());
+				if(designer.isWidgetsIntersect() && dragBackupBounds != null && hoveredComponent != null){
+					XCreator selectionXCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
+					if(selectionXCreator != null){
+						selectionXCreator.setBounds(dragBackupBounds.x, dragBackupBounds.y, dragBackupBounds.width, dragBackupBounds.height);
+						MoveUtils.hideForbidWindow();
+					}
+				}
+				dragBackupBounds = null;
                 // 拉伸时鼠标拖动过快，导致所在组件获取会为空
                 if (hoveredComponent == null && e.getY() < 0) {
                 	// bug63538
@@ -326,10 +338,12 @@ public class EditingMouseListener extends MouseInputAdapter {
 				if (designer.getCursor().getType() == Cursor.HAND_CURSOR) {
 					designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 				}
-				if (e.getX() > (parent.getX() + parent.getWidth() / 2 - EDIT_BTN_WIDTH / 2 - GAP)
+				int minX = getParentPositionX(parent, parent.getX()) + parent.getWidth() / 2;
-						&& e.getX() < (parent.getX() + parent.getWidth() / 2 + EDIT_BTN_WIDTH / 2 + GAP)) {
+				int minY = getParentPositionY(parent, parent.getY()) + parent.getHeight() / 2;
-					if (e.getY() > (parent.getY() + parent.getHeight() / 2 - EDIT_BTN_HEIGHT / 2 - GAP)
+				int offsetX = EDIT_BTN_WIDTH / 2 + GAP;
-							&& e.getY() < (parent.getY() + parent.getHeight() / 2 + EDIT_BTN_HEIGHT / 2 + GAP + designer.getParaHeight())) {
+				int offsetY = EDIT_BTN_HEIGHT / 2 + GAP;
+				if (e.getX() > (minX - offsetX) && e.getX() < (minX + offsetX)) {
+					if (e.getY() > (minY - offsetY) && e.getY() < (minY + offsetY + designer.getParaHeight())) {
 						designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 					}
 				}
@@ -385,6 +399,12 @@ public class EditingMouseListener extends MouseInputAdapter {
 				stateModel.dragging(e);
 				// 获取e所在的焦点组件
 				XCreator hotspot = designer.getComponentAt(e.getX(), e.getY());
+				if(dragBackupBounds == null) {
+					XCreator selectingXCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
+					if(selectingXCreator != null){
+						dragBackupBounds = new Rectangle(selectingXCreator.getX(), selectingXCreator.getY(), selectingXCreator.getWidth(), selectingXCreator.getHeight());
+					}
+				}
 				// 拉伸时鼠标拖动过快，导致所在组件获取会为空
 				if (hotspot == null) {
 					return;
@@ -417,11 +437,43 @@ public class EditingMouseListener extends MouseInputAdapter {
 		designer.repaint();
 	}
 
+	//当前编辑的组件是在布局中，鼠标点击布局外部，需要一次性将布局及其父布局都置为不可编辑
+	private void setTopLayoutUnEditable(XLayoutContainer clickedTopLayout, XLayoutContainer clickingTopLayout){
+		//双击的前后点击click为相同对象，过滤掉
+		if (clickedTopLayout == null || clickedTopLayout == clickingTopLayout){
+			return;
+		}
+		//位于同一层级的控件，父布局相同，过滤掉
+		if (clickingTopLayout != null && clickedTopLayout.getParent() == clickingTopLayout.getParent()){
+			return;
+		}
+		//前后点击的位于不同层级，要置为不可编辑
+		XLayoutContainer xLayoutContainer = (XLayoutContainer)clickedTopLayout.getParent();
+		if (xLayoutContainer == clickingTopLayout){
+			return;
+		}
+		if (xLayoutContainer != null){
+			xLayoutContainer.setEditable(false);
+			setTopLayoutUnEditable((XLayoutContainer) clickedTopLayout.getParent(), clickingTopLayout);
+		}
+	}
+
+	private boolean isCreatorInLayout(XCreator creator, XCreator layout){
+		if (creator == layout){
+			return true;
+		}
+		if(layout.getParent() != null){
+			return isCreatorInLayout(creator, (XCreator)layout.getParent());
+		}
+		return false;
+	}
+
 	private XCreator processTopLayoutMouseClick(XCreator creator){
 		XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(creator).getTopLayout();
 		if(topLayout != null){
-			if (clickTopLayout != null && clickTopLayout != topLayout){
+			if (clickTopLayout != null && clickTopLayout != topLayout && !isCreatorInLayout(clickTopLayout, topLayout)){
 				clickTopLayout.setEditable(false);
+				setTopLayoutUnEditable(clickTopLayout, topLayout);
 			}
 			clickTopLayout = topLayout;
 			if(!topLayout.isEditable()) {
@@ -431,6 +483,7 @@ public class EditingMouseListener extends MouseInputAdapter {
 		else{
 			if(clickTopLayout != null){
 				clickTopLayout.setEditable(false);
+				setTopLayoutUnEditable(clickTopLayout, null);
 			}
 		}
 

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

@@ -9,6 +9,7 @@ import java.awt.dnd.DropTarget;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
 import java.awt.dnd.DropTargetEvent;
+import java.util.ArrayList;
 
 import javax.swing.BorderFactory;
 import javax.swing.JWindow;
@@ -85,8 +86,12 @@ public class FormCreatorDropTarget extends DropTarget {
 		if (success) {
 			// 如果添加成功，则触发相应事件
             XCreator xCreator = container.acceptType(XWParameterLayout.class) ? designer.getParaComponent() : designer.getRootComponent();
+			//SetSelection时要确保选中的是最顶层的布局
+			//tab布局添加的时候是初始化了XWCardLayout，实际上最顶层的布局是XWCardMainBorderLayout
+			XCreator addingXCreator = addingModel.getXCreator();
+			Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData();
 			designer.getSelectionModel().setSelectedCreators(
-					FormSelectionUtils.rebuildSelection(xCreator, new Widget[]{addingModel.getXCreator().toData()}));
+					FormSelectionUtils.rebuildSelection(xCreator, new Widget[]{widget}));
 			designer.getEditListenerTable().fireCreatorModified(addingModel.getXCreator(), DesignerEvent.CREATOR_ADDED);
 		} else {
 			Toolkit.getDefaultToolkit().beep();

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

@@ -84,6 +84,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     private ConnectorHelper ConnectorHelper;
     private boolean isReportBlockEditing = false;
 
+    //组件重叠
+    private boolean isWidgetsIntersect = false;
+
     /**
      * 下面的变量都是非序列化成员，不记录设计状态，只作为设计时临时状态使用。
      */
@@ -539,6 +542,12 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         if (paraComponent != null && paraComponent.acceptType(XWParameterLayout.class)){
             return true;
         }
+        else{
+            if (this.getSelectionModel().getSelection().getSelectedCreator().getParent() != null
+                    && ((XLayoutContainer)this.getSelectionModel().getSelection().getSelectedCreator().getParent()).acceptType(XWAbsoluteLayout.class)){
+                return true;
+            }
+        }
         return false;
     }
 
@@ -558,6 +567,14 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         return this.isReportBlockEditing;
     }
 
+    public void setWidgetsIntersect(boolean isWidgetsIntersect){
+        this.isWidgetsIntersect = isWidgetsIntersect;
+    }
+
+    public boolean isWidgetsIntersect(){
+        return this.isWidgetsIntersect;
+    }
+
     /**
      * 是否重命名控件
      * @param creator 组件

designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessiblePropertyEditor.java

@@ -33,6 +33,11 @@ public class AccessiblePropertyEditor extends AbstractPropertyEditor {
         editor.setValue(value);
     }
 
+    @Override
+    public boolean refreshInTime() {
+        return true;
+    }
+
     @Override
     public Object getValue() {
         return editor.getValue();

designer_form/src/com/fr/design/mainframe/widget/editors/AbsoluteLayoutDirectionEditor.java

@@ -0,0 +1,13 @@
+package com.fr.design.mainframe.widget.editors;
+
+import com.fr.design.designer.properties.EnumerationEditor;
+import com.fr.design.designer.properties.items.FRAbsoluteConstraintsItems;
+
+/**
+ * Created by zhouping on 2016/8/1.
+ */
+public class AbsoluteLayoutDirectionEditor extends EnumerationEditor {
+    public AbsoluteLayoutDirectionEditor() {
+        super(new FRAbsoluteConstraintsItems());
+    }
+}

sonar-project.properties

@@ -0,0 +1,15 @@
+# must be unique in a given SonarQube instance
+sonar.projectKey=finereport.design
+# this is the name displayed in the SonarQube UI
+sonar.projectName=finereport.design
+sonar.projectVersion=1.0
+sonar.branch=master
+ 
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+# Since SonarQube 4.2, this property is optional if sonar.modules is set. 
+# If not set, SonarQube starts looking for source code from the directory containing 
+# the sonar-project.properties file.
+sonar.sources=.
+ 
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8

start.bat

@@ -0,0 +1 @@
+sonar-scanner