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

build.gradle

@@ -2,10 +2,9 @@ apply plugin: "java"
 tasks.withType(JavaCompile){
 	options.encoding = "UTF-8"
 }
-
 def basicDir="../../"
 def libDir="${basicDir}/finereport-lib-stable"
-//获取什么分支名
+//获取什么分支名
 FileTree files =fileTree(dir:"./",include:"build.gradle")
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\"))
 def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1)

build.gradle.bak

@@ -0,0 +1,86 @@
+apply plugin: "java"
+tasks.withType(JavaCompile){
+	options.encoding = "UTF-8"
+}
+sourceCompatibility=1.7
+def basicDir="../../"
+def libDir="${basicDir}/finereport-lib-stable"
+//获取什么分支名
+FileTree files =fileTree(dir:"./",include:"build.gradle")
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\"))
+def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1)
+
+task appletJar<<{
+	
+	ant{
+		mkdir(dir:"${libDir}/tmp-${branchName}")
+		mkdir(dir:"build/classes/")
+		copy(todir:"build/classes/"){
+			fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main")
+	
+			fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main")
+							
+			fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main")		
+			
+			fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main")
+						
+			fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main")
+
+		}
+		unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}")
+		unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}")
+		jar(jarfile:"build/libs/fr-applet-8.0.jar"){
+			fileset(dir:"build/classes"){
+				exclude(name:"*.*")
+				exclude(name:"bin/*.*")
+				exclude(name:"classes/**")
+				exclude(name:"com/fr/schedule/**")
+				exclude(name:"com/fr/cell/**")
+				exclude(name:"com/fr/dialog/**")
+				exclude(name:"com/fr/view/**")
+				exclude(name:"com/fr/web/**")
+				exclude(name:"com/fr/fs/**")
+				exclude(name:"com/fr/design/**")
+				exclude(name:"com/fr/start/**")
+				exclude(name:"com/fr/process/**")
+			}
+			fileset(dir:"${libDir}/tmp-${branchName}"){
+				include(name:"javax/mail/**")
+				include(name:"javax/servlet/**")
+				include(name:"org/freehep/**")
+				include(name:"com/fr/third/JAI/**")
+				include(name:"com/fr/third/antlr/**")
+				include(name:"com/fr/third/javax/**")
+				include(name:"com/sun/xml/**")
+				include(name:"javax/xml/**")
+
+			}
+			fileset(dir:"build/classes"){
+				include(name:"com/fr/web/*.class")
+				include(name:"com/fr/web/attr/*.class")
+			}
+		}
+		delete(dir:"${libDir}/tmp-${branchName}")
+		def jdk6home=	"D:/FineReport/develop/java/jdk1.6u35"
+		def keystore="frapplet.store"
+		def keycert="fr.cert"
+		def keypassword="123456"
+		def keyalias="fr"
+		
+		exec(executable:"${jdk6home}/bin/keytool"){
+			arg(line:"-genkey -dname &quot;CN=FineReport L=NanJing C=China&quot; -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}")
+		}
+		exec(executable:"${jdk6home}/bin/keytool"){
+			arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}")
+		}
+
+		exec(executable:"${jdk6home}/bin/jarsigner"){
+			arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}")
+		}
+		delete(file:"${keystore}")
+		delete(file:"${keycert}")
+		delete(dir:"build/classes")
+	
+	}
+
+}

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

@@ -75,7 +75,6 @@ public class BBSLoginDialog extends UIDialog {
     // 用户登录状态label
     private UserInfoLabel userInfoLabel;
 
-
     public UILabel getTipLabel() {
         return tipLabel;
     }
@@ -84,7 +83,6 @@ public class BBSLoginDialog extends UIDialog {
         this.tipLabel = tipLabel;
     }
 
-
     /**
      * 构造函数
      *
@@ -213,7 +211,6 @@ public class BBSLoginDialog extends UIDialog {
         DesignerEnvManager.getEnvManager().setBBSPassword(String.valueOf(passField.getPassword()));
         userInfoLabel.setUserName(nameField.getText());
         userInfoLabel.getUserInfoPane().markSignIn(nameField.getText());
-        userInfoLabel.getUserInfoPane().getSwitchAccountLabel().setVisible(true);
         BBSLoginDialog.this.setVisible(false);
     }
 

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

@@ -0,0 +1,35 @@
+package com.fr.design.mainframe.bbs;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
+import com.fr.general.SiteCenter;
+import com.fr.general.http.HttpClient;
+import com.fr.stable.StringUtils;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by zhaohehe on 16/7/26.
+ */
+public class LoginDialog extends UIDialog {
+    private static final Dimension DEFAULT_SHOP = new Dimension(404, 234);
+    
+    public LoginDialog(Frame frame, BasicPane pane) {
+        super(frame);
+        setUndecorated(true);
+        JPanel panel = (JPanel) getContentPane();
+        panel.setLayout(new BorderLayout());
+        add(pane, BorderLayout.CENTER);
+        setSize(DEFAULT_SHOP);
+        GUICoreUtils.centerWindow(this);
+        setResizable(false);
+        setTitle(Inter.getLocText("FR-Designer-Plugin_Manager"));
+    }
+
+    @Override
+    public void checkValid() throws Exception {
+    }
+}

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

@@ -5,12 +5,16 @@ package com.fr.design.mainframe.bbs;
 
 import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.extra.LoginCheckContext;
+import com.fr.design.dialog.UIDialog;
-import com.fr.design.extra.LoginCheckListener;
+import com.fr.design.extra.*;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
+import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.stable.EncodeConstants;
@@ -41,7 +45,7 @@ public class UserInfoLabel extends UILabel{
 	private static final String MESSAGE_KEY = "messageCount";
 	
 	private static final int MIN_MESSAGE_COUNT = 1;
-	
+	private static final int MENU_HEIGHT = 20;
 
 	//用户名
 	private String userName;
@@ -87,6 +91,19 @@ public class UserInfoLabel extends UILabel{
 				bbsLoginDialog.showWindow();
 			}
 		});
+
+		UserLoginContext.addLoginContextListener(new LoginContextListener() {
+			@Override
+			public void showLoginContext() {
+				LoginPane managerPane = new LoginPane();
+				UIDialog qqdlg = new LoginDialog(DesignerContext.getDesignerFrame(),managerPane);
+				LoginWebBridge.getHelper().setDialogHandle(qqdlg);
+				LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
+				QQLoginWebBridge.getHelper().setLoginlabel();
+				qqdlg.setVisible(true);
+			}
+		});
+
 	}
 
 	/**
@@ -242,22 +259,41 @@ public class UserInfoLabel extends UILabel{
 
 		@Override
 		public void mouseClicked(MouseEvent e) {
-			if(StringUtils.isNotEmpty(userName)){
+			if(StringUtils.isNotEmpty(userName)) {
-                try {
+				UIPopupMenu menu = new UIPopupMenu();
-                    Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.default")));
+				menu.setOnlyText(true);
-                } catch (Exception exp) {
+				menu.setPopupSize(userInfoPane.getWidth(),userInfoPane.getHeight()*3);
+
+				//私人消息
+				UIMenuItem priviteMessage = new UIMenuItem(Inter.getLocText("FR-Designer-BBSLogin_Privite-Message"));
+				priviteMessage.addMouseListener(new MouseAdapter() {
+					public void mousePressed(MouseEvent e) {
+						if(StringUtils.isNotEmpty(userName)){
+							try {
+								Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.default")));
+							} catch (Exception exp) {
+								FRContext.getLogger().info(exp.getMessage());
+							}
+							return;
+						}
+					}
 
-                }
+				});
-                return;
+				//切换账号
+				UIMenuItem closeOther = new UIMenuItem(Inter.getLocText("FR-Designer-BBSLogin_Switch-Account"));
+				closeOther.addMouseListener(new MouseAdapter() {
+					public void mousePressed(MouseEvent e) {
+						UserLoginContext.fireLoginContextListener();
+					}
+
+				});
+				menu.add(priviteMessage);
+				menu.add(closeOther);
+				GUICoreUtils.showPopupMenu(menu, UserInfoLabel.this, 0, MENU_HEIGHT);
+			} else {
+				UserLoginContext.fireLoginContextListener();
 			}
-            if(bbsLoginDialog == null){
-                bbsLoginDialog = new BBSLoginDialog(DesignerContext.getDesignerFrame(),UserInfoLabel.this);
-            }
-            bbsLoginDialog.clearLoginInformation();
-            bbsLoginDialog.setModal(true);
-            bbsLoginDialog.showWindow();
 		}
-
 	};
 
 }

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

@@ -40,8 +40,6 @@ public class UserInfoPane extends BasicPane{
 	private static final int WAIT_TIME = 10000;
 	
 	private UserInfoLabel userInfoLabel;
-	private ExitLabel switchAccountLabel;
-
 
 	public UserInfoLabel getUserInfoLabel() {
 		return userInfoLabel;
@@ -51,13 +49,6 @@ public class UserInfoPane extends BasicPane{
 		this.userInfoLabel = userInfoLabel;
 	}
 
-	public ExitLabel getSwitchAccountLabel() {
-		return switchAccountLabel;
-	}
-
-	public void setSwitchAccountLabel(ExitLabel switchAccountLabel) {
-		this.switchAccountLabel = switchAccountLabel;
-	}
 	
 	/**
 	 * 构造函数
@@ -67,14 +58,12 @@ public class UserInfoPane extends BasicPane{
 		this.setLayout(new BorderLayout());
 		
 		this.userInfoLabel = new UserInfoLabel(this);
-		this.switchAccountLabel = new ExitLabel(this);
 
 		this.markUnSignIn();
 		autoLogin();
 		autoPushLoginDialog();
 		
 		this.add(userInfoLabel, BorderLayout.CENTER);
-		this.add(switchAccountLabel, BorderLayout.EAST);
 	}
 	
 	// 后台自动登录
@@ -164,11 +153,9 @@ public class UserInfoPane extends BasicPane{
 	 */
 	public void markUnSignIn(){
 		this.userInfoLabel.setText(Inter.getLocText("FR-Base_UnSignIn"));
-		this.switchAccountLabel.setVisible(false);
 		this.userInfoLabel.setOpaque(true);
 		this.userInfoLabel.setBackground(UN_LOGIN_BACKGROUND);
 		this.userInfoLabel.resetUserName();
-		
 	}
 	
 	/**
@@ -179,11 +166,8 @@ public class UserInfoPane extends BasicPane{
 	public void markSignIn(String userName){
 		this.userInfoLabel.setText(userName);
 		this.userInfoLabel.setUserName(userName);
-		this.switchAccountLabel.setVisible(true);
 		this.userInfoLabel.setOpaque(true);
 		this.userInfoLabel.setBackground(LOGIN_BACKGROUND);
-		this.switchAccountLabel.setOpaque(true);
-		this.switchAccountLabel.setBackground(LOGIN_BACKGROUND);
 	}
 	
 	@Override
@@ -191,5 +175,4 @@ public class UserInfoPane extends BasicPane{
 		return StringUtils.EMPTY;
 	}
 
-	
 }

designer_base/build.gradle

@@ -3,11 +3,11 @@ apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
-//指定构建的jdk版本
+//指定构建的jdk版本
 sourceCompatibility=1.8
-//指定生成jar包版本
+//指定生成jar包版本
 version='8.0'
-//生成jar包重命名
+//生成jar包重命名
 jar{
 	baseName='fr-designer-core'
 }
@@ -15,7 +15,7 @@ jar{
 
 def srcDir="."
 
-//指定源码路径
+//指定源码路径
 sourceSets{
 		main{
 			java{
@@ -23,13 +23,13 @@ sourceSets{
 			}
 		}
 }
-//获取什么分支名
+//获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 
-//声明外部依赖
+//声明外部依赖
 dependencies{
 
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
@@ -37,7 +37,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*
 
  	testCompile 'junit:junit:4.12'
 }
-//复制非.java文件到classes文件夹下参与打包
+//复制非.java文件到classes文件夹下参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
 		from ("${srcDir}/src"){
@@ -49,14 +49,14 @@ task copyFile(type:Copy,dependsOn:compileJava){
 }
 
 
-//压缩项目中的js文件
+//压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}
-	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
 		fileset (dir:"${srcDir}/src"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')

designer_base/build.gradle.bak

@@ -0,0 +1,70 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.8
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-core'
+}
+
+
+def srcDir="."
+
+//指定源码路径
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/src"]
+			}
+		}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+
+compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
+
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../../finereport-lib4build-stable',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}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

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

@@ -0,0 +1,8 @@
+package com.fr.design.extra;
+
+/**
+ * Created by lp on 2016/8/16.
+ */
+public interface LoginContextListener {
+    void showLoginContext();
+}

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

@@ -0,0 +1,143 @@
+package com.fr.design.extra;
+
+import com.fr.base.FRContext;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
+import com.fr.design.dialog.BasicPane;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+import com.fr.general.SiteCenter;
+import com.fr.general.http.HttpClient;
+import com.fr.plugin.PluginVerifyException;
+import com.fr.stable.StableUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * Created by zhaohehe on 16/7/27.
+ */
+public class LoginPane extends BasicPane {
+    private static final String LATEST = "latest";
+
+    public LoginPane() {
+        setLayout(new BorderLayout());
+        if (StableUtils.getMajorJavaVersion() == 8) {
+            String installHome;
+            if (StableUtils.isDebug()) {
+                URL url = ClassLoader.getSystemResource("");
+                installHome = url.getPath();
+                addPane(installHome);
+            } else {
+                installHome = StableUtils.getInstallHome();
+                File file = new File(StableUtils.pathJoin(installHome, "scripts"));
+                if (!file.exists()) {
+                    int rv = JOptionPane.showConfirmDialog(
+                            this,
+                            Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"),
+                            Inter.getLocText("FR-Designer-Plugin_Warning"),
+                            JOptionPane.OK_CANCEL_OPTION,
+                            JOptionPane.INFORMATION_MESSAGE
+                    );
+                    if (rv == JOptionPane.OK_OPTION) {
+                        downloadShopScripts();
+                    }
+                } else {
+                    addPane(installHome);
+                    updateShopScripts();
+                }
+            }
+        } else {
+        }
+    }
+
+    private void addPane(String installHome) {
+        LoginWebPane webPane = new LoginWebPane(new File(installHome).getAbsolutePath(),LoginPane.this);
+        add(webPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Inter.getLocText("FR-Designer-Plugin_Manager");
+    }
+
+    private void downloadShopScripts() {
+        new SwingWorker<Boolean, Void>() {
+            @Override
+            protected Boolean doInBackground() throws Exception {
+                String id = "shop_scripts";
+                String username = DesignerEnvManager.getEnvManager().getBBSName();
+                String password = DesignerEnvManager.getEnvManager().getBBSPassword();
+                try {
+                    PluginHelper.downloadPluginFile(id, username, password, new Process<Double>() {
+                        @Override
+                        public void process(Double integer) {
+                        }
+                    });
+                } catch (PluginVerifyException e) {
+                    JOptionPane.showMessageDialog(LoginPane.this, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    return false;
+                } catch (Exception e) {
+                    FRContext.getLogger().error(e.getMessage(), e);
+                    return false;
+                }
+                return true;
+            }
+
+            @Override
+            protected void done() {
+
+                try {
+                    if (get()) {
+                        IOUtils.unzip(new File(StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE)), StableUtils.getInstallHome());
+                        int rv = JOptionPane.showOptionDialog(
+                                LoginPane.this,
+                                Inter.getLocText("FR-Designer-Plugin_Shop_Installed"),
+                                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                JOptionPane.YES_NO_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE,
+                                null,
+                                new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")},
+                                null
+                        );
+                        if (rv == JOptionPane.OK_OPTION) {
+                            RestartHelper.restart();
+                        }
+                    }
+                } catch (InterruptedException | ExecutionException e) {
+                    FRContext.getLogger().error(e.getMessage(), e);
+                }
+
+            }
+        }.execute();
+    }
+
+    private void updateShopScripts() {
+        new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() throws Exception {
+                HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("store.version") + "&version=" + PluginStoreConstants.VERSION);
+                if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                    if (!ComparatorUtils.equals(httpClient.getResponseText(), LATEST)) {
+                        int rv = JOptionPane.showConfirmDialog(
+                                LoginPane.this,
+                                Inter.getLocText("FR-Designer-Plugin_Shop_Need_Update"),
+                                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                JOptionPane.OK_CANCEL_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE
+                        );
+                        if (rv == JOptionPane.OK_OPTION) {
+                            downloadShopScripts();
+                        }
+                    }
+                }
+                return null;
+            }
+        }.execute();
+    }
+}

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

@@ -0,0 +1,188 @@
+package com.fr.design.extra;
+
+import com.fr.base.FRContext;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.FRLogger;
+import com.fr.general.SiteCenter;
+import com.fr.general.http.HttpClient;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.StringUtils;
+import javafx.scene.web.WebEngine;
+
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import javax.swing.*;
+import java.awt.*;
+import java.net.URLEncoder;
+
+/**
+ * Created by zhaohehe on 16/8/1.
+ */
+public class LoginWebBridge {
+
+    private static final String LOGIN_SUCCESS_FLAG = "http://bbs.finereport.com";
+    private static final String LOGININ = "0";
+    private static final String LOGIN_INFO_EMPTY = "-1";
+    private static final String DISCONNECTED = "-2";
+    private static final String UNKNOWN_ERROR = "-3";
+    private static final int TIME_OUT = 10000;
+
+    private static com.fr.design.extra.LoginWebBridge helper;
+    private UIDialog uiDialog;
+    private UILabel uiLabel;
+
+    private boolean testConnection() {
+        HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("bbs.test"));
+        return client.isServerAlive();
+    }
+
+    public static com.fr.design.extra.LoginWebBridge getHelper() {
+        if (helper != null) {
+                return helper;
+        }
+        synchronized (com.fr.design.extra.LoginWebBridge.class) {
+            if (helper == null) {
+                    helper = new com.fr.design.extra.LoginWebBridge();
+            }
+            return helper;
+        }
+    }
+
+    public static com.fr.design.extra.LoginWebBridge getHelper(WebEngine webEngine) {
+        getHelper();
+        helper.setEngine(webEngine);
+        return helper;
+    }
+
+    private WebEngine webEngine;
+
+    private LoginWebBridge() {
+    }
+
+    public void setEngine(WebEngine webEngine) {
+        this.webEngine = webEngine;
+    }
+
+    public void setDialogHandle(UIDialog uiDialog) {
+        this.uiDialog = uiDialog;
+    }
+
+    public void setUILabel(UILabel uiLabel) {
+        this.uiLabel = uiLabel;
+    }
+
+    /**
+     * 注册页面
+     */
+    public void registerHref() {
+        try {
+            Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.default")));
+        }catch (Exception e) {
+            FRContext.getLogger().info(e.getMessage());
+        }
+    }
+
+    /**
+     * 忘记密码
+     */
+    public void forgetHref() {
+        try {
+            Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.default")));
+        }catch (Exception e) {
+            FRContext.getLogger().info(e.getMessage());
+        }
+    }
+
+    /**
+     * 登录操作的回调
+     * @param username
+     * @param password
+     * @return
+     */
+    public String defaultLogin(String username, String password) {
+        if (!StringUtils.isNotBlank(username) && !StringUtils.isNotBlank(password)) {
+            return LOGIN_INFO_EMPTY;
+        }
+        if (!testConnection()) {
+            return DISCONNECTED;
+        }
+        if (login(username, password)) {
+            updateUserInfo(username, password);
+            loginSuccess(username);
+            return LOGININ;
+        }else {
+            return UNKNOWN_ERROR;
+        }
+    }
+
+    /**
+     * 关闭窗口
+     */
+    public void closeWindow() {
+        if (uiDialog != null) {
+            uiDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            uiDialog.setVisible(false);
+        }
+    }
+
+    public void updateUserInfo(String username,String password) {
+        DesignerEnvManager.getEnvManager().setBBSName(username);
+        DesignerEnvManager.getEnvManager().setBBSPassword(password);
+    }
+
+    /**
+     * 关闭窗口并且重新赋值
+     * @param username
+     */
+    public void loginSuccess(String username) {
+        closeWindow();
+        uiLabel.setText(username);
+    }
+
+    /**
+     * 弹出QQ授权页面
+     */
+    public void showQQ() {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                //弹出qq登录的窗口
+                QQLoginPane managerPane = new QQLoginPane();
+                UIDialog qqlog = new QQLoginDialog(DesignerContext.getDesignerFrame(),managerPane);
+                QQLoginWebBridge.getHelper().setDialogHandle(uiDialog);
+                QQLoginWebBridge.getHelper().setQQDialogHandle(qqlog);
+                QQLoginWebBridge.getHelper().setUILabel(uiLabel);
+                qqlog.setVisible(true);
+            }
+        });
+    }
+
+    public boolean login(String username, String password) {
+        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) {
+            try {
+                username = URLEncoder.encode(username, EncodeConstants.ENCODING_GBK);
+                password = URLEncoder.encode(password, 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);
+                    if (res.contains(LOGIN_SUCCESS_FLAG)) {
+                        return true;
+                    }
+                } catch (Exception e) {
+                    FRLogger.getLogger().error(e.getMessage());
+                }
+            }
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.fr.design.extra;
+
+import javafx.application.Platform;
+import javafx.embed.swing.JFXPanel;
+import javafx.event.EventHandler;
+import javafx.scene.Scene;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebEvent;
+import javafx.scene.web.WebView;
+import netscape.javascript.JSObject;
+
+import javax.swing.*;
+
+/**
+ * Created by zhaohehe on 16/7/26.
+ */
+public class LoginWebPane extends JFXPanel {
+
+    private WebEngine webEngine;
+    private LoginPane loginPane;
+
+    public LoginWebPane(final String installHome,LoginPane loginPane) {
+        this.loginPane = loginPane;
+        Platform.setImplicitExit(false);
+        Platform.runLater(new Runnable() {
+            @Override
+            public void run() {
+                BorderPane root = new BorderPane();
+                Scene scene = new Scene(root);
+                LoginWebPane.this.setScene(scene);
+                WebView webView = new WebView();
+                webEngine = webView.getEngine();
+                webEngine.load("file:///" + installHome + "/scripts/store/web/login.html");
+                webEngine.setOnAlert(new EventHandler<WebEvent<String>>() {
+                    @Override
+                    public void handle(WebEvent<String> event) {
+                        showAlert(event.getData());
+                    }
+                });
+                JSObject obj = (JSObject) webEngine.executeScript("window");
+                obj.setMember("LoginHelper", LoginWebBridge.getHelper(webEngine));
+                webView.setContextMenuEnabled(false);//屏蔽右键
+                root.setCenter(webView);
+            }
+        });
+    }
+
+    public void setEngine(WebEngine webEngine) {
+        this.webEngine = webEngine;
+    }
+
+    private void showAlert(final String message) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                JOptionPane.showMessageDialog(LoginWebPane.this, message);
+            }
+        });
+    }
+}

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

@@ -37,7 +37,7 @@ public class PluginManagerPane extends BasicPane {
 
     public PluginManagerPane() {
         setLayout(new BorderLayout());
-        if (System.getProperty("java.version").startsWith("1.8")) {
+        if (StableUtils.getMajorJavaVersion() == 8) {
             String installHome;
             if (StableUtils.isDebug()) {
                 URL url = ClassLoader.getSystemResource("");

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

@@ -6,6 +6,7 @@ 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;
@@ -361,6 +362,42 @@ public class PluginWebBridge {
         return false;
     }
 
+    /**
+     * 获取系统登录的用户名
+     * @param callback
+     */
+    public void getLoginInfo(final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new GetLoginInfoExecutor());
+        new Thread(task).start();
+    }
+
+    /**
+     * 打开论坛消息界面
+     */
+    public void getPriviteMessage() {
+        try {
+            Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.default")));
+        }catch (Exception exp) {
+            FRContext.getLogger().info(exp.getMessage());
+        }
+    }
+
+    /**
+     * 打开登录页面
+     */
+    public void loginContent() {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                UserLoginContext.fireLoginContextListener();
+            }
+        });
+    }
+
+    public void getUsername() {
+
+    }
+
     /**
      * 在本地浏览器里打开url
      * tips:重载的时候,需要给js调用的方法需要放在前面,否则可能不会被调用(此乃坑)

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

@@ -0,0 +1,34 @@
+package com.fr.design.extra;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by zhaohehe on 16/7/28.
+ */
+public class QQLoginDialog extends UIDialog {
+    private static final Dimension DEFAULT_SHOP = new Dimension(700, 500);
+
+    public QQLoginDialog(Frame frame, BasicPane pane) {
+        super(frame);
+        setUndecorated(true);
+        JPanel panel = (JPanel) getContentPane();
+        panel.setLayout(new BorderLayout());
+        add(pane, BorderLayout.CENTER);
+        setSize(DEFAULT_SHOP);
+        GUICoreUtils.centerWindow(this);
+        setResizable(false);
+        setTitle(Inter.getLocText("FR-Designer-Plugin_Manager"));
+
+    }
+
+    @Override
+    public void checkValid() throws Exception {
+    }
+
+}

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

@@ -0,0 +1,145 @@
+package com.fr.design.extra;
+
+import com.fr.base.FRContext;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
+import com.fr.design.dialog.BasicPane;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+import com.fr.general.SiteCenter;
+import com.fr.general.http.HttpClient;
+import com.fr.plugin.PluginVerifyException;
+import com.fr.stable.StableUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * Created by zhaohehe on 16/7/28.
+ */
+public class QQLoginPane extends BasicPane {
+    private static final String LATEST = "latest";
+
+    public QQLoginPane() {
+        setLayout(new BorderLayout());
+        if (StableUtils.getMajorJavaVersion() == 8) {
+            String installHome;
+            if (StableUtils.isDebug()) {
+                URL url = ClassLoader.getSystemResource("");
+                installHome = url.getPath();
+                addPane(installHome);
+            } else {
+                installHome = StableUtils.getInstallHome();
+                File file = new File(StableUtils.pathJoin(installHome, "scripts"));
+                if (!file.exists()) {
+                    int rv = JOptionPane.showConfirmDialog(
+                            this,
+                            Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"),
+                            Inter.getLocText("FR-Designer-Plugin_Warning"),
+                            JOptionPane.OK_CANCEL_OPTION,
+                            JOptionPane.INFORMATION_MESSAGE
+                    );
+                    if (rv == JOptionPane.OK_OPTION) {
+                        downloadShopScripts();
+                    }
+                } else {
+                    addPane(installHome);
+                    updateShopScripts();
+                }
+            }
+        } else {
+        }
+    }
+
+    private void addPane(String installHome) {
+        QQLoginWebPane webPane = new QQLoginWebPane(new File(installHome).getAbsolutePath());
+        add(webPane, BorderLayout.CENTER);
+    }
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return Inter.getLocText("FR-Designer-Plugin_Manager");
+    }
+
+
+    private void downloadShopScripts() {
+        new SwingWorker<Boolean, Void>() {
+            @Override
+            protected Boolean doInBackground() throws Exception {
+                String id = "shop_scripts";
+                String username = DesignerEnvManager.getEnvManager().getBBSName();
+                String password = DesignerEnvManager.getEnvManager().getBBSPassword();
+                try {
+                    PluginHelper.downloadPluginFile(id, username, password, new Process<Double>() {
+                        @Override
+                        public void process(Double integer) {
+                        }
+                    });
+                } catch (PluginVerifyException e) {
+                    JOptionPane.showMessageDialog(QQLoginPane.this, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    return false;
+                } catch (Exception e) {
+                    FRContext.getLogger().error(e.getMessage(), e);
+                    return false;
+                }
+                return true;
+            }
+
+            @Override
+            protected void done() {
+
+                try {
+                    if (get()) {
+                        IOUtils.unzip(new File(StableUtils.pathJoin(PluginHelper.DOWNLOAD_PATH, PluginHelper.TEMP_FILE)), StableUtils.getInstallHome());
+                        int rv = JOptionPane.showOptionDialog(
+                                QQLoginPane.this,
+                                Inter.getLocText("FR-Designer-Plugin_Shop_Installed"),
+                                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                JOptionPane.YES_NO_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE,
+                                null,
+                                new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")},
+                                null
+                        );
+                        if (rv == JOptionPane.OK_OPTION) {
+                            RestartHelper.restart();
+                        }
+                    }
+                } catch (InterruptedException | ExecutionException e) {
+                    FRContext.getLogger().error(e.getMessage(), e);
+                }
+
+            }
+        }.execute();
+    }
+
+    private void updateShopScripts() {
+        new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() throws Exception {
+                HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("store.version") + "&version=" + PluginStoreConstants.VERSION);
+                if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                    if (!ComparatorUtils.equals(httpClient.getResponseText(), LATEST)) {
+                        int rv = JOptionPane.showConfirmDialog(
+                                QQLoginPane.this,
+                                Inter.getLocText("FR-Designer-Plugin_Shop_Need_Update"),
+                                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                                JOptionPane.OK_CANCEL_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE
+                        );
+                        if (rv == JOptionPane.OK_OPTION) {
+                            downloadShopScripts();
+                        }
+                    }
+                }
+                return null;
+            }
+        }.execute();
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.fr.design.extra;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.gui.ilable.UILabel;
+import javafx.scene.web.WebEngine;
+import org.json.JSONObject;
+
+import javax.swing.*;
+
+/**
+ * Created by lp on 2016/8/10.
+ */
+public class QQLoginWebBridge {
+
+    private static com.fr.design.extra.QQLoginWebBridge helper;
+    private WebEngine webEngine;
+    private static String LOGINSUCCESS = "ok";
+    private static String LOGINFAILED = "failed";
+    private UIDialog uiDialog;
+    private UILabel uiLabel;
+    private UIDialog qqDialog;
+    private String username;
+
+
+    private QQLoginWebBridge() {
+    }
+
+    public static com.fr.design.extra.QQLoginWebBridge getHelper() {
+        if (helper != null) {
+            return helper;
+        }
+        synchronized (com.fr.design.extra.QQLoginWebBridge.class) {
+            if (helper == null) {
+                helper = new com.fr.design.extra.QQLoginWebBridge();
+            }
+            return helper;
+        }
+    }
+
+    public void setEngine(WebEngine webEngine) {
+        this.webEngine = webEngine;
+    }
+
+    public void setDialogHandle(UIDialog uiDialog) {
+        this.uiDialog = uiDialog;
+    }
+
+    public void setQQDialogHandle(UIDialog uiDialog) {
+        this.qqDialog = uiDialog;
+    }
+
+    public void setUILabel(UILabel uiLabel) {
+        this.uiLabel = uiLabel;
+    }
+
+    public void setLoginlabel() {
+        username = DesignerEnvManager.getEnvManager().getBBSName();
+    }
+
+    public static com.fr.design.extra.QQLoginWebBridge getHelper(WebEngine webEngine) {
+        getHelper();
+        helper.setEngine(webEngine);
+        return helper;
+    }
+
+    /**
+     * 关闭QQ授权窗口
+     */
+    public void closeQQWindow() {
+        if (qqDialog != null) {
+            qqDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            qqDialog.setVisible(false);
+        }
+    }
+
+    /**
+     * 关闭父窗口
+     */
+    public void closeParentWindow() {
+        if (uiDialog != null) {
+            uiDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+            uiDialog.setVisible(false);
+        }
+    }
+
+    /**
+     * 获取用户信息
+     * @param userInfo
+     */
+    public void getLoginInfo(String userInfo) {
+        JSONObject jo = new JSONObject(userInfo);
+        String status = jo.get("status").toString();
+        if (status.equals(LOGINSUCCESS)) {
+            String username = jo.get("username").toString();
+            closeQQWindow();
+            closeParentWindow();
+            uiLabel.setText(username);
+            DesignerEnvManager.getEnvManager().setBBSName(username);
+        }else if (status.equals(LOGINFAILED)){
+            //账号没有QQ授权
+            closeQQWindow();
+        }
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.fr.design.extra;
+
+import javafx.application.Platform;
+import javafx.embed.swing.JFXPanel;
+import javafx.event.EventHandler;
+import javafx.scene.Scene;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebEvent;
+import javafx.scene.web.WebView;
+import netscape.javascript.JSObject;
+
+import javax.swing.*;
+
+/**
+ * Created by zhaohehe on 16/7/28.
+ */
+public class QQLoginWebPane extends JFXPanel {
+
+    private WebEngine webEngine;
+
+    public QQLoginWebPane(final String installHome) {
+        Platform.setImplicitExit(false);
+        Platform.runLater(new Runnable() {
+            @Override
+            public void run() {
+                BorderPane root = new BorderPane();
+                Scene scene = new Scene(root);
+                QQLoginWebPane.this.setScene(scene);
+                WebView webView = new WebView();
+                webEngine = webView.getEngine();
+                webEngine.load("file:///" + installHome + "/scripts/store/web/qqLogin.html");
+                webEngine.setOnAlert(new EventHandler<WebEvent<String>>() {
+                    @Override
+                    public void handle(WebEvent<String> event) {
+                        showAlert(event.getData());
+                    }
+                });
+                JSObject obj = (JSObject) webEngine.executeScript("window");
+                obj.setMember("QQLoginHelper", QQLoginWebBridge.getHelper(webEngine));
+                webView.setContextMenuEnabled(false);//屏蔽右键
+                root.setCenter(webView);
+            }
+        });
+    }
+
+    private void showAlert(final String message) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                JOptionPane.showMessageDialog(QQLoginWebPane.this, message);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.fr.design.extra;
+
+import java.util.ArrayList;
+
+/**
+ * Created by lp on 2016/8/16.
+ */
+public class UserLoginContext {
+    private static ArrayList<LoginContextListener> fireLoginContextListener = new ArrayList<LoginContextListener>();
+
+    /**
+     * 触发登录框弹出的监听器
+     */
+    public static void fireLoginContextListener() {
+        for (LoginContextListener l : fireLoginContextListener) {
+            l.showLoginContext();
+        }
+    }
+
+    /**
+     * 添加一个弹出登录框的监听事件
+     *
+     * @param l 登录框弹出监听事件
+     */
+    public static void addLoginContextListener(LoginContextListener l) {
+        fireLoginContextListener.add(l);
+    }
+}

designer_base/src/com/fr/design/extra/exe/GetLoginInfoExecutor.java

@@ -0,0 +1,37 @@
+package com.fr.design.extra.exe;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.extra.Process;
+
+/**
+ * Created by lp on 2016/8/16.
+ */
+public class GetLoginInfoExecutor implements Executor {
+    private String result = "[]";
+
+    @Override
+    public String getTaskFinishMessage() {
+        return result;
+    }
+
+    @Override
+    public Command[] getCommands() {
+        return new Command[]{
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return null;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        String username = DesignerEnvManager.getEnvManager().getBBSName();
+                        if (username == null) {
+                        }else {
+                            result = username;
+                        }
+                    }
+                }
+        };
+    }
+}

designer_chart/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
-//指定构建的jdk版本
+//指定构建的jdk版本
 sourceCompatibility=1.8
-//指定生成jar包的版本
+//指定生成jar包的版本
 version='8.0'
 
 def srcDir="."
 
-//对生成的jar包进行重命名
+//对生成的jar包进行重命名
 
 jar{
 	baseName='fr-designer-chart'
@@ -28,14 +28,14 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 
-//指定外部依赖
+//指定外部依赖
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
 compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
 
  	testCompile 'junit:junit:4.12'
 }
-//将非.java 文件复制到classes文件夹下参与打包
+//将非.java 文件复制到classes文件夹下参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
 		from ("${srcDir}/src"){
@@ -47,14 +47,14 @@ task copyFile(type:Copy,dependsOn:compileJava){
 
 }
 
-//压缩项目中的js文件
+//压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}
-	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
 		fileset (dir:"${srcDir}/src"){
 			include (name:'**/*.js')
 			include (name:'**/*.css')

designer_chart/build.gradle.bak

@@ -0,0 +1,66 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.8
+//指定生成jar包的版本
+version='8.0'
+
+def srcDir="."
+
+//对生成的jar包进行重命名
+
+jar{
+	baseName='fr-designer-chart'
+}
+
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/src"]
+			}
+		}
+}
+FileTree files =fileTree(dir:'./',include:'build.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//指定外部依赖
+dependencies{
+compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
+
+ 	testCompile 'junit:junit:4.12'
+}
+//将非.java 文件复制到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../../finereport-lib4build-stable',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}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+

designer_form/build.gradle

@@ -3,19 +3,19 @@ apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
-//指定构建的jdk版本
+//指定构建的jdk版本
 sourceCompatibility=1.8
-//指定生成的jar包版本
+//指定生成的jar包版本
 version='8.0'
 
 def srcDir="."
 
 
-//指明生成jar包的名字
+//指明生成jar包的名字
 jar{
 	baseName='fr-designer-report'
 }
-//源码所在位置
+//源码所在位置
 sourceSets{
 		main{
 			java{
@@ -25,12 +25,12 @@ sourceSets{
 		}
 }
 
-//获取什么分支名
+//获取什么分支名
 FileTree files =fileTree(dir:'./',include:'build.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
-//声明外部依赖
+//声明外部依赖
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
 compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar")
@@ -38,7 +38,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/b
  	testCompile 'junit:junit:4.12'
 }
 
-//指明无法编译文件所在路径
+//指明无法编译文件所在路径
 def dataContent ={def dir ->
 		copySpec{
 			from ("${dir}"){
@@ -47,7 +47,7 @@ def dataContent ={def dir ->
 		}
 }
 
-//将非.java文件复制到classes文件夹下 参与打包
+//将非.java文件复制到classes文件夹下 参与打包
 task copyFile(type:Copy,dependsOn:compileJava){
 	copy{
 		with dataContent.call("${srcDir}/src") 
@@ -58,7 +58,7 @@ task copyFile(type:Copy,dependsOn:compileJava){
 }
 
 
-//压缩项目中的js文件
+//压缩项目中的js文件
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {

designer_form/build.gradle.bak

@@ -0,0 +1,83 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.8
+//指定生成的jar包版本
+version='8.0'
+
+def srcDir="."
+
+
+//指明生成jar包的名字
+jar{
+	baseName='fr-designer-report'
+}
+//源码所在位置
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/src",
+"${srcDir}/../designer/src"]
+			}
+		}
+}
+
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+//声明外部依赖
+dependencies{
+compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar")
+
+ 	testCompile 'junit:junit:4.12'
+}
+
+//指明无法编译文件所在路径
+def dataContent ={def dir ->
+		copySpec{
+			from ("${dir}"){
+				exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+			}
+		}
+}
+
+//将非.java文件复制到classes文件夹下 参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		with dataContent.call("${srcDir}/src") 
+		with dataContent.call("${srcDir}/../designer/src") 
+		into ('build/classes/main')
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+
+			fileset(dir:'../../../finereport-lib4build-stable',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}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+
+		}
+		fileset (dir:"${srcDir}/../designer/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+

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

@@ -9,18 +9,31 @@ import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter;
 import com.fr.design.designer.creator.*;
 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;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.FRLogger;
 
-public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
+public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
+	//是不是添加到父容器上
+	private boolean isAdd2ParentLayout = false;
 	private HoverPainter painter;
+
     public FRAbsoluteLayoutAdapter(XLayoutContainer container) {
         super(container);
 		painter = new FRAbsoluteLayoutPainter(container);
+		initMinSize();
     }
 
+	private void initMinSize() {
+		XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
+		minWidth = layout.getActualMinWidth();
+		minHeight = layout.getActualMinHeight();
+		actualVal = layout.getAcualInterval();
+		margin = layout.toData().getMargin();
+	}
+
 	@Override
 	public HoverPainter getPainter() {
 		return painter;
@@ -37,39 +50,169 @@ public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
 	public boolean accept(XCreator creator, int x, int y) {
 		Component comp = container.getComponentAt(x, y);
 		//布局控件要先判断是不是可编辑
+		//可以编辑，按原有逻辑判断
+		//不可编辑，当成一整个控件处理
+		if (comp == null){
+			return false;
+		}
 		XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator)comp).getTopLayout();
-		if(topLayout != null && !topLayout.isEditable()){
+		if(topLayout != null){
+			if (topLayout.isEditable()){
+				return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
+						&& creator.getWidth() <= container.getWidth();
+			}
+			else {
+				return acceptWidget(creator, x, y);
+			}
+		}
+		else{
+			FRLogger.getLogger().error("top layout is null!");
+		}
+
+		return false;
+	}
+
+	/**
+	 * 判断是否鼠标在组件的三等分区域，如果组件在布局管理器中间，上下左右都可能会三等分
+	 * @param parentComp 鼠标所在区域的组件
+	 * @param x 坐标x
+	 * @param y 坐标y
+	 * @return 是则返回true
+	 */
+	public boolean isTrisectionArea(Component parentComp, int x, int y) {
+		XCreator creator = (XCreator)parentComp;
+		trisectAreaDirect = 0;
+		if (container.getComponentCount()<=1) {
 			return false;
 		}
-		boolean isAccept =  x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
+		int maxWidth = parentComp.getWidth();
-				&& creator.getWidth() <= container.getWidth();
+		int maxHeight = parentComp.getHeight();
-		return isAccept;
+		int xL = parentComp.getX();
+		int yL = parentComp.getY();
+		// 组件宽高的十分之一和默认值取大
+		int minRangeWidth = Math.max(maxWidth/BORDER_PROPORTION, DEFAULT_AREA_LENGTH);
+		int minRangeHeight = Math.max(maxHeight/BORDER_PROPORTION, DEFAULT_AREA_LENGTH);
+		if(y<yL+minRangeHeight ) {
+			// 在组件上侧三等分
+			trisectAreaDirect = COMP_TOP;
+		} else if(y>yL+maxHeight-minRangeHeight) {
+			// 在组件下侧三等分
+			trisectAreaDirect = COMP_BOTTOM;
+		} else if (x<xL+minRangeWidth) {
+			// 在组件左侧三等分
+			trisectAreaDirect = COMP_LEFT;
+		} else if(x>xL+maxWidth-minRangeWidth) {
+			// 在组件右侧三等分
+			trisectAreaDirect = COMP_RIGHT;
+		}
+		// tab布局的边界特殊处理，不进行三等分
+		if(!creator.getTargetChildrenList().isEmpty()){
+			return false;
+		}
+
+		return !ComparatorUtils.equals(trisectAreaDirect, 0);
 	}
 
-    @Override
+	private boolean acceptWidget(XCreator creator, int x, int y){
+		isFindRelatedComps = false;
+		//拖入组件判断时，先判断是否为交叉点区域，其次三等分区域，再次平分区域
+		Component comp = container.getComponentAt(x, y);
+		boolean isMatchEdge = false;
+		//如果当前处于边缘地带, 那么就把他贴到父容器上
+		XLayoutContainer parent = container.findNearestFit();
+		container = parent != null ? parent : container;
+		isAdd2ParentLayout = true;
+
+		int componentHeight = comp.getHeight();
+		int componentWidth = comp.getWidth();
+		//上半部分高度
+		int upHeight = (int) (componentHeight * TOP_HALF) + comp.getY();
+		//下半部分高度
+		int downHeight = (int) (componentHeight * BOTTOM_HALF) + comp.getY();
+
+		if (isCrossPointArea(comp, x, y)) {
+			return canAcceptWhileCrossPoint(comp, x, y);
+		}
+
+		if (isTrisectionArea(comp, x, y)) {
+			return canAcceptWhileTrisection(comp, x, y);
+		}
+
+		boolean horizonValid = componentWidth >= minWidth * 2 + actualVal;
+		boolean verticalValid = componentHeight >= minHeight * 2 + actualVal;
+		return y > upHeight && y < downHeight ? horizonValid : verticalValid;
+	}
+
+	/**
+	 * 组件的ComponentAdapter在添加组件时，如果发现布局管理器不为空，会继而调用该布局管理器的
+	 * addComp方法来完成组件的具体添加。在该方法内，布局管理器可以提供额外的功能。
+	 *
+	 * @param creator 被添加的新组件
+	 * @param x       添加的位置x，该位置是相对于container的
+	 * @param y       添加的位置y，该位置是相对于container的
+	 * @return 是否添加成功，成功返回true，否则false
+	 */
+	@Override
+	public boolean addBean(XCreator creator, int x, int y) {
+		Rectangle rect = ComponentUtils.getRelativeBounds(container);
+
+		int posX = x + rect.x;
+		int posY = y + rect.y;
+		if (!accept(creator, x, y)) {
+			return false;
+		}
+		addComp(creator, posX, posY);
+		((XWidgetCreator) creator).recalculateChildrenSize();
+		return true;
+	}
+
+	@Override
 	protected void addComp(XCreator creator, int x, int y) {
-		if (XCreatorUtils.getParentXLayoutContainer(creator) != null) {
+		if(!isAdd2ParentLayout) {
 			Rectangle r = ComponentUtils.getRelativeBounds(container);
-			Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator);
+			x = x - r.x;
-			x = creatorRectangle.x - r.x;
+			y = y - r.y;
-			y = creatorRectangle.y - r.y;
+			if (XCreatorUtils.getParentXLayoutContainer(creator) != null) {
-		} else {
-			int w = creator.getWidth() / 2;
-			int h = creator.getHeight() / 2;
-			x = x - w;
-			y = y - h;
-		}
 
-		fix(creator, x, y);
+				Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator);
+				x = creatorRectangle.x - r.x;
+				y = creatorRectangle.y - r.y;
+			} else {
+				int w = creator.getWidth() / 2;
+				int h = creator.getHeight() / 2;
+				x = x - w;
+				y = y - h;
+			}
+			fix(creator, x, y);
 
-		if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
+			if (creator.hasTitleStyle()) {
-			addParentCreator(creator);
+				addParentCreator(creator);
-		} else {
+			} else {
-			container.add(creator, creator.toData().getWidgetName());
+				container.add(creator, creator.toData().getWidgetName());
+			}
+			XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
+			layout.updateBoundsWidget(creator);
+			LayoutUtils.layoutRootContainer(container);
+		}else{
+			fixAbsolute(creator, x, y);
+			if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
+				addParentCreator(creator);
+			} else {
+				container.add(creator, creator.toData().getWidgetName());
+			}
+			XWFitLayout layout = (XWFitLayout) container;
+			// 更新对应的BoundsWidget
+			layout.updateBoundsWidget();
+			updateCreatorBackBound();
+		}
+	}
+
+	private void updateCreatorBackBound() {
+		for (int i=0,size=container.getComponentCount(); i<size; i++) {
+			XCreator creator = (XCreator) container.getComponent(i);
+			creator.updateChildBound(minHeight);
+			creator.setBackupBound(creator.getBounds());
 		}
-		XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
-		layout.updateBoundsWidget(creator);
-		LayoutUtils.layoutRootContainer(container);
 	}
 
 	private void addParentCreator(XCreator child) {
@@ -77,7 +220,31 @@ public class FRAbsoluteLayoutAdapter extends AbstractLayoutAdapter {
 		container.add(parentPanel, child.toData().getWidgetName());
 	}
 
-    /**
+	/**
+	 *  新拖入组件时，计算调整其他关联组件位置大小
+	 * @param child  新拖入的组件
+	 * @param x 鼠标所在x坐标
+	 * @param y 鼠标所在y坐标
+	 */
+	private void fixAbsolute(XCreator child, int x, int y) {
+		Component parentComp = container.getComponentAt(x, y);
+		if (container.getComponentCount()==0){
+			child.setLocation(0, 0);
+			child.setSize(parentComp.getWidth(), parentComp.getHeight());
+		} else if(isCrossPointArea(parentComp, x, y)){
+			//交叉区域插入组件时，根据具体位置进行上下或者左右或者相邻三个组件的位置大小插入
+			fixCrossPointArea(parentComp, child, x, y);
+			return;
+		} else if (isTrisectionArea(parentComp, x, y)) {
+			// 在边界三等分区域，就不再和组件二等分了
+			fixTrisect(parentComp, child, x, y);
+			return;
+		} else{
+			fixHalve(parentComp, child, x, y);
+		}
+	}
+
+	/**
      * 组件拖拽后调整大小
      * @param creator 组件
      */

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

@@ -40,9 +40,9 @@ public class Inner extends AccessDirection {
 		}
 		if (y < 0) {
 			y = 0;
-		} else if (y + current_bounds.getHeight() > designer.getRootComponent().getHeight()
+		} else if (y + current_bounds.getHeight() > (designer.getRootComponent().getHeight() + designer.getParaHeight())
 				&& designer.getSelectionModel().hasSelectionComponent()) {
-			y = designer.getRootComponent().getHeight() - current_bounds.height;
+			y = designer.getRootComponent().getHeight() + designer.getParaHeight() - current_bounds.height;
 		}
 		return new Point(x, y);
 	}

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

@@ -1,6 +1,13 @@
 package com.fr.design.designer.beans.painters;
 
+import com.fr.design.designer.beans.adapters.layout.FRAbsoluteLayoutAdapter;
+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.form.util.XCreatorConstants;
+import com.fr.design.mainframe.DesignerFrame;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.general.FRLogger;
 
 import java.awt.*;
 
@@ -8,19 +15,188 @@ import java.awt.*;
  * Created by zhouping on 2016/7/11.
  */
 public class FRAbsoluteLayoutPainter extends AbstractPainter {
+
+    private static final int BORDER_PROPORTION = 10;
+    private static final int X = 0;
+    private static final int Y = 1;
+    private static final int WIDTH = 2;
+    private static final int HEIGHT = 3;
+
+    private static final Color DEPEND_LINE_COLOR = new Color(200, 200, 200);
+    private static final int DEPEND_LINE_SCOPE = 3;
+
+    /**
+     * 构造函数
+     * @param container
+     */
     public FRAbsoluteLayoutPainter(XLayoutContainer container) {
         super(container);
     }
 
     /**
      * 组件渲染
-     *
+     * @param g 画图类
-     * @param g      画图类
      * @param startX 开始位置x
      * @param startY 开始位置y
      */
     @Override
     public void paint(Graphics g, int startX, int startY) {
+        if(hotspot_bounds == null && creator != null && container != null){
+            drawDependingLine(g);
+            return;
+        }
         super.paint(g, startX, startY);
+        //如果absolute不可编辑那么就将之当普通控件处理，在周围添加控件，
+        //否则，只往内部添加，不需要出现蓝色悬浮提示框
+        if(container.isEditable()){
+            return;
+        }
+        int x = hotspot.x - hotspot_bounds.x;
+        int y = hotspot.y - hotspot_bounds.y;
+        FRAbsoluteLayoutAdapter adapter = (FRAbsoluteLayoutAdapter) container.getLayoutAdapter();
+
+        int[] hot_rec;
+
+        boolean accept = adapter.accept(creator, x, y);
+        Component currentComp = container.getComponentAt(x, y);
+        //不可编辑的时候要获取顶层的绝对布局容器
+        if (XCreatorUtils.getHotspotContainer((XCreator) currentComp) != null) {
+            currentComp = XCreatorUtils.getHotspotContainer((XCreator) currentComp).getTopLayout();
+            if (currentComp == null) {
+                FRLogger.getLogger().info("FRAbsoluteLayoutPainter get currentComp null!");
+                return;
+            }
+        }
+        else{
+            FRLogger.getLogger().info("FRAbsoluteLayoutPainter getHotspotContainer currentComp null!");
+            return;
+        }
+        Color bColor = XCreatorConstants.FIT_LAYOUT_HOTSPOT_COLOR;
+        if (accept) {
+            y = (y == container.getHeight()) ? y - 1 : y;
+            x = (x == container.getWidth()) ? x - 1 : x;
+            hot_rec = adapter.getChildPosition(currentComp, creator, x + hotspot_bounds.x, y + hotspot_bounds.y);
+        } else {
+            bColor = XCreatorConstants.LAYOUT_FORBIDDEN_COLOR;
+            Rectangle rec = currentComp.getBounds();
+            hot_rec = currentComp == container ? new int[]{x, y, 0, 0} : new int[]{rec.x, rec.y, rec.width, rec.height};
+        }
+        drawRegionBackground(g, hot_rec[X], hot_rec[Y] + startY, hot_rec[WIDTH], hot_rec[HEIGHT], bColor, accept);
+        if (accept) {
+            //画交叉区域和中间点区域
+            //拖入的区域也改为整个渲染，点区域的后画下，不然被遮住了
+            paintCrossPoint(currentComp, g, x, y);
+        }
+    }
+
+    private void paintCrossPoint(Component currentComp, Graphics g, int x, int y) {
+        if (currentComp == container) {
+            return;
+        }
+        Color bColor = XCreatorConstants.FIT_LAYOUT_POINT_COLOR;
+        int cX = currentComp.getX(), cY = currentComp.getY(), cH = currentComp.getHeight(), cW = currentComp.getWidth();
+        int defaultWidth = cW / BORDER_PROPORTION, defaultHeight = cH / BORDER_PROPORTION;
+        // 交叉点提示区域最大值为10px
+        int defaultLength = Math.min(BORDER_PROPORTION, Math.min(defaultWidth, defaultHeight));
+        Component topComp = container.getTopComp(cX, cY);
+        Component bottomComp = container.getBottomComp(cX, cY, cH);
+        Component rightComp = container.getRightComp(cX, cY, cW); //组件的左右组件要区分上侧和下侧
+        Component leftComp = container.getLeftComp(cX, cY);
+        boolean top = topComp != null && topComp != container, left = leftComp != null && leftComp != container,
+                bottom = bottomComp != null && bottomComp != container, right = rightComp != null && rightComp != container;
+        if (top || left) {
+            drawRegionBackground(g, cX + hotspot_bounds.x, cY + hotspot_bounds.y, defaultLength, defaultLength, bColor, true);
+        }
+        if (bottom || left) {
+            drawRegionBackground(g, cX + hotspot_bounds.x, cY + cH - defaultLength + hotspot_bounds.y, defaultLength, defaultLength, bColor,true);
+        }
+        if (top || right) {
+            drawRegionBackground(g, cX + cW - defaultLength + hotspot_bounds.x, cY + hotspot_bounds.y, defaultLength, defaultLength, bColor,true);
+        }
+        if (bottom || right) {
+            drawRegionBackground(g, cX + cW - defaultLength + hotspot_bounds.x, cY + cH - defaultLength + hotspot_bounds.y, defaultLength, defaultLength, bColor,true);
+        }
+        if (left && right) {
+            if (leftComp.getY() == cY && rightComp.getY() == cY) {
+                drawRegionBackground(g, cX + cW / 2 - defaultWidth + hotspot_bounds.x, cY + hotspot_bounds.y, defaultWidth * 2, defaultLength, bColor,true);
+            }
+            //底边线位置，左右组件都不为null且低端对齐，取左、右靠下侧组件判断
+            leftComp = container.getBottomLeftComp(cX, cY, cH);
+            rightComp = container.getBottomRightComp(cX, cY, cH, cW);
+            if ((leftComp.getY() + leftComp.getHeight() == cY + cH) && (rightComp.getY() + rightComp.getHeight()== cY + cH)) {
+                drawRegionBackground(g, cX + cW / 2 - defaultWidth + hotspot_bounds.x, cY + cH - defaultLength + hotspot_bounds.y, defaultWidth * 2, defaultLength, bColor,true);
+            }
+        }
+        if (top && bottom) {
+            if (topComp.getX() == cX && bottomComp.getX() == cX) {
+                drawRegionBackground(g, cX + hotspot_bounds.x, cY + cH / 2 - defaultHeight + hotspot_bounds.y, defaultLength, defaultHeight * 2, bColor,true);
+            }
+            // 右边线位置，上下组件不为null且右端对齐，取上、下靠右侧组件判断
+            topComp = container.getRightTopComp(cX, cY, cW);
+            bottomComp = container.getRightBottomComp(cX, cY, cH, cW);
+            if ((topComp.getX() + topComp.getWidth() == cX + cW) && (bottomComp.getX() + bottomComp.getWidth() == cX + cW)) {
+                drawRegionBackground(g, cX + cW - defaultLength + hotspot_bounds.x, cY + cH / 2 - defaultHeight + hotspot_bounds.y, defaultLength, defaultHeight * 2, bColor,true);
+            }
+        }
+    }
+
+    // 画依附线
+    private void drawDependingLine(Graphics g){
+        Graphics2D g2d = (Graphics2D) g;
+        Stroke backup = g2d.getStroke();
+
+        // 当前拖拽组件的坐标
+        int oriX = creator.getX();
+        int oriY = creator.getY();
+
+        // 拖拽位置的即时坐标
+        double x = hotspot.getX();
+        double y = hotspot.getY();
+
+        // 容器所有的内部组件的横纵坐标值
+        int[] posXs = container.getHors();
+        int[] posYs = container.getVeris();
+
+        // 依附线的坐标
+        int lineX = 0;
+        int lineY = 0;
+
+        // 根据拖拽位置调整依附线的坐标
+        lineX = getDependLinePos(lineX, posXs, oriX, x);
+        lineY = getDependLinePos(lineY, posYs, oriY, y);
+
+
+        g2d.setStroke(backup);
+        g2d.setColor(DEPEND_LINE_COLOR);
+        if(lineX != 0){
+            g2d.drawRect(lineX, 0, 0, container.getHeight());
+        }
+        if(lineY != 0){
+            g2d.drawRect(0, lineY, container.getWidth(), 0);
+        }
+
+    }
+
+    /**
+     * 根据容器内部组件的横纵坐标值画依附线
+     *
+     * @param lineCoordinate 依附线坐标值
+     * @param referCoordinates 容器内部所有组件坐标值
+     * @param oriCoordinate 当前拖拽组件坐标
+     * @param currentCoordinate 拖拽位置的即时坐标
+     * @return 依附线的坐标
+     *
+     */
+    private int getDependLinePos(int lineCoordinate,int referCoordinates[],int oriCoordinate,double currentCoordinate){
+        for(int i = 0; i < referCoordinates.length; i++){
+            if(referCoordinates[i] == oriCoordinate){
+                continue;
+            }
+            if(currentCoordinate > referCoordinates[i] - DEPEND_LINE_SCOPE && currentCoordinate < referCoordinates[i] + DEPEND_LINE_SCOPE){
+                lineCoordinate = referCoordinates[i];
+                break;
+            }
+        }
+        return lineCoordinate;
     }
 }

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

@@ -21,10 +21,9 @@ import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.form.layout.FRAbsoluteLayout;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.icon.IconPathConstants;
-import com.fr.design.mainframe.EditingMouseListener;
+import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.FormArea;
-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;
@@ -34,10 +33,14 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WFitLayout;
+import com.fr.form.ui.container.WLayout;
 import com.fr.general.FRScreen;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.stable.core.PropertyChangeAdapter;
+import org.eclipse.swt.internal.gdip.Rect;
+
+import javax.swing.*;
 
 /**
  * @author richer
@@ -47,6 +50,8 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	private static final int EDIT_BTN_WIDTH = 60;
 	private static final int EDIT_BTN_HEIGHT = 24;
+	private int minWidth = WLayout.MIN_WIDTH;
+	private int minHeight = WLayout.MIN_HEIGHT;
 
 	//由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
 	protected double containerPercent = 1.0;
@@ -97,6 +102,35 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	 */
 	public void setContainerPercent(double containerPercent) {
 		this.containerPercent = containerPercent;
+		minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH*containerPercent);
+		minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT*containerPercent);
+	}
+
+	/**
+	 * 返回界面处根据百分比调整后的最小宽度
+	 * @return 最小宽度
+	 */
+	public int getActualMinWidth() {
+		return this.minWidth;
+	}
+
+	/**
+	 * 返回界面处根据百分比调整后的最小高度
+	 * @return 最小高度
+	 */
+	public int getActualMinHeight() {
+		return this.minHeight;
+	}
+
+	/**
+	 * 返回界面处根据百分比调整后的间隔大小（且为偶数）
+	 * @return 间隔
+	 */
+	public int getAcualInterval() {
+		// adapter那边交叉三等分、删除都要判断是否对齐，所以间隔转为偶数
+		int interval = (int) (toData().getCompInterval()*containerPercent);
+		int val = interval/2;
+		return val*2;
 	}
 
 	/**
@@ -114,16 +148,46 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	}
 
 	/**
-	 * 新增删除拉伸后更新每个组件的BoundsWidget
+	 * 新增删除拉伸后单个组件的BoundsWidget
 	 */
 	public void updateBoundsWidget(XCreator xCreator) {
 		WAbsoluteLayout layout = this.toData();
-		if (xCreator.shouldScaleCreator() || xCreator.hasTitleStyle()) {
+		if (xCreator.hasTitleStyle()) {
 			xCreator = (XLayoutContainer)xCreator.getParent();
 		}
 		BoundsWidget boundsWidget = layout.getBoundsWidget(xCreator.toData());
 		Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
-		boundsWidget.setCalculatedBounds(rectangle);
+	}
+
+	private Rectangle calculateBound(Rectangle rec, double pw, double ph){
+		Rectangle calRec = new Rectangle(0,0,0,0);
+		calRec.x = (int)(rec.x / pw);
+		calRec.y = (int)(rec.y / ph);
+		calRec.width = (int)(rec.width / pw);
+		calRec.height = (int)(rec.height / ph);
+		return calRec;
+	}
+
+	/**
+	 * 新增删除拉伸后每个组件的BoundsWidget
+	 */
+	public void updateBoundsWidget() {
+		WAbsoluteLayout layout = this.toData();
+		Rectangle backupBound = this.getBackupBound();
+		Rectangle currentBound = this.getBounds();
+		if (backupBound != null && layout.getCompState() == WAbsoluteLayout.STATE_FIT) {
+			double percentW = ((double) backupBound.width / (double) currentBound.width);
+			double percentH = ((double) backupBound.height / (double) currentBound.height);
+			for (int index = 0, n = this.getComponentCount(); index < n; index++){
+				XCreator creator = (XCreator) this.getComponent(index);
+				BoundsWidget wgt = layout.getBoundsWidget(creator.toData());
+				// 用当前的显示大小计算后调正具体位置
+				Rectangle wgtBound = dealWidgetBound(creator.getBounds());
+				Rectangle rec = calculateBound(wgtBound, percentW, percentH);
+				wgt.setBounds(rec);
+				creator.setBounds(rec);
+			}
+		}
 	}
 	
 	/**

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

@@ -744,6 +744,10 @@ public class XWFitLayout extends XLayoutContainer {
     				tabLayout.updateBoundsWidget();
     			}
     		}
+			//如果子组件是绝对布局，则内部的widget也要更新
+			if (creator.acceptType(XWAbsoluteLayout.class)){
+				((XWAbsoluteLayout) creator).updateBoundsWidget();
+			}
     	}
     	layout.setContainerHeight(containerHeight);
     	layout.setContainerWidth(containerWidth);
@@ -801,6 +805,7 @@ public class XWFitLayout extends XLayoutContainer {
         BoundsWidget bw = wlayout.getBoundsWidget(wgt);
         wlayout.removeWidget(bw);
         updateBoundsWidget();
+		((FRFitLayoutAdapter)getLayoutAdapter()).updateCreatorBackBound();
     }
     
     /**

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

@@ -183,4 +183,11 @@ public class XWParameterLayout extends XWAbsoluteLayout {
     @Override
     public void updateBoundsWidget(XCreator xCreator) {
     }
+
+    /**
+     * 新增删除拉伸后每个组件的BoundsWidget
+     */
+    @Override
+    public void updateBoundsWidget() {
+    }
 }

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/*, 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);
}
+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/FormDesignerUI.java

@@ -95,9 +95,9 @@ public class FormDesignerUI extends ComponentUI {
 
         if (designer.getPainter() != null) {
             // ComponentAdapter和LayoutAdapter提供的额外的Painter，该Painter一般用于提示作用，
-            // 相当于一个浮动层
+            // 相当于一个浮动层, 要考虑参数面板的高度
             designer.getPainter().paint(g, designer.getArea().getHorizontalValue(),
-                    designer.getArea().getVerticalValue());
+                    designer.getArea().getVerticalValue() + designer.getParaHeight());
         }
         AddingModel addingModel = designer.getAddingModel();