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

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

@@ -279,8 +279,10 @@ public class BBSLoginDialog extends UIDialog {
      * @return 同上
      */
     public static 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());
             }
@@ -297,6 +299,7 @@ public class BBSLoginDialog extends UIDialog {
                     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/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_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/beans/BasicBeanPane.java

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

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

@@ -14,6 +14,7 @@ public class Absorptionline {
 	// 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;
 
@@ -238,114 +239,155 @@ public class Absorptionline {
 
 	//朝向上方的等距线
 	private void paintTopEquidistantLine(Graphics g){
-		int x1[] = {
+		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[] = {
+		int[] y1, y2;
+		if (equidistantStart.y - top > WIDGET_DISTANCE_MIN) {
+			y1 = new int[] {
 					top,
 					top + RECTANGLE_OFFSET_Y,
 					top + RECTANGLE_OFFSET_Y
 			};
-		int x2[] = {
+			y2 = new int[]{
-				equidistantStart.x + equidistantStart.width / 2,
-				equidistantStart.x + equidistantStart.width / 2 + RECTANGLE_OFFSET_X,
-				equidistantStart.x + equidistantStart.width / 2 - RECTANGLE_OFFSET_X
-		};
-		int y2[] = {
 					equidistantStart.y - RESIZE_BOX_SIZE,
 					equidistantStart.y - RESIZE_BOX_SIZE - RECTANGLE_OFFSET_Y,
 					equidistantStart.y - RESIZE_BOX_SIZE - RECTANGLE_OFFSET_Y
 			};
-		g.fillPolygon(x1, y1, 3);
+		}
-		g.fillPolygon(x2, y2, 3);
+		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 x1[] = {
+		int y[] = {
-				left,
-				left + RECTANGLE_OFFSET_Y,
-				left + RECTANGLE_OFFSET_Y,
-		};
-		int y1[] = {
 				equidistantStart.y + equidistantStart.height / 2,
 				equidistantStart.y + equidistantStart.height / 2 - RECTANGLE_OFFSET_X,
 				equidistantStart.y + equidistantStart.height / 2 + RECTANGLE_OFFSET_X,
 		};
-		int x2[] = {
+		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
 			};
-		int y2[] = {
+		}
-				equidistantStart.y + equidistantStart.height / 2,
+		else{
-				equidistantStart.y + equidistantStart.height / 2 + RECTANGLE_OFFSET_X,
+			x1 = new int[] {
-				equidistantStart.y + equidistantStart.height / 2 - RECTANGLE_OFFSET_X
+					left,
+					left - RECTANGLE_OFFSET_Y,
+					left - RECTANGLE_OFFSET_Y,
 			};
-		g.fillPolygon(x1, y1, 3);
+			x2 = new int[] {
-		g.fillPolygon(x2, y2, 3);
+					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 - RESIZE_BOX_SIZE, equidistantStart.y + equidistantStart.height / 2);
+				equidistantStart.x, equidistantStart.y + equidistantStart.height / 2);
 	}
 	//朝向下方的等距线
 	private void paintBottomEquidistantLine(Graphics g) {
-		int x1[] = {
+		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[] = {
+		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,
 			};
-		int x2[] = {
+			y2 = new int[] {
-				equidistantStart.x + equidistantStart.width / 2,
-				equidistantStart.x + equidistantStart.width / 2 + RECTANGLE_OFFSET_X,
-				equidistantStart.x + equidistantStart.width / 2 - RECTANGLE_OFFSET_X
-		};
-		int y2[] = {
 					bottom,
 					bottom - RECTANGLE_OFFSET_Y,
 					bottom - RECTANGLE_OFFSET_Y
 			};
-		g.fillPolygon(x1, y1, 3);
+		}
-		g.fillPolygon(x2, y2, 3);
+		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 + RESIZE_BOX_SIZE,
+				equidistantStart.x + equidistantStart.width / 2, equidistantStart.y + equidistantStart.height,
 				equidistantStart.x + equidistantStart.width / 2, bottom);
 	}
 	//朝向右侧的等距线
 	private void paintRightEquidistantLine(Graphics g){
-		int x1[] = {
+		int y[] = {
-				right,
-				right - 3,
-				right - 3
-		};
-		int y1[] = {
 				equidistantStart.y + equidistantStart.height / 2,
 				equidistantStart.y + equidistantStart.height / 2 - RECTANGLE_OFFSET_X,
 				equidistantStart.y + equidistantStart.height / 2 + RECTANGLE_OFFSET_X
 		};
-		int x2[] = {
+		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
 			};
-		int y2[] = {
+		}
-				equidistantStart.y + equidistantStart.height / 2,
+		else{
-				equidistantStart.y + equidistantStart.height / 2 - RECTANGLE_OFFSET_X,
+			x1 = new int[]{
-				equidistantStart.y + equidistantStart.height / 2 + RECTANGLE_OFFSET_X,
+					right,
+					right + RECTANGLE_OFFSET_Y,
+					right + RECTANGLE_OFFSET_Y
 			};
-		g.fillPolygon(x1, y1, 3);
+			x2 = new int[]{
-		g.fillPolygon(x2, y2, 3);
+					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 + RESIZE_BOX_SIZE, equidistantStart.y + equidistantStart.height / 2,
+				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

@@ -468,6 +468,7 @@ public class MoveUtils {
 				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
@@ -477,6 +478,7 @@ public class MoveUtils {
 				equidistantLines.add(equidistantLines1[1]);
 				equidistantLines.add(equidistantLines1[3]);
 				pEquidistantX.palce = operatingRectangle.x - offset / 2;
+				operatingRectangle.x = pEquidistantX.palce;
 			}
 		}
 	}

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;
     }

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()));
-        }
 
         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/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.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,7 +42,6 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(hyperEditPane, BorderLayout.CENTER);
-
         ChartCollection cc = createChartCollection();
 		
 		chartComponent = new ChartComponent();

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

@@ -109,7 +109,6 @@ public class NormalChartDataPane extends DataContentsPane {
 		} 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/layout/FRAbsoluteLayoutAdapter.java

@@ -2,14 +2,14 @@ package com.fr.design.designer.beans.adapters.layout;
 
 import java.awt.*;
 
+import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.beans.HoverPainter;
 import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter;
-import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.*;
-import com.fr.design.designer.creator.XCreatorUtils;
-import com.fr.design.designer.creator.XLayoutContainer;
-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;
@@ -112,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/creator/XWAbsoluteLayout.java

@@ -7,6 +7,7 @@ import java.awt.*;
 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;
@@ -17,15 +18,21 @@ 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
@@ -106,6 +113,16 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		this.setLayout(new FRAbsoluteLayout());
 	}
 
+	/**
+	 * 是否支持标题样式
+	 *
+	 * @return 默认false
+	 */
+	@Override
+	public boolean hasTitleStyle() {
+		return false;
+	}
+
 	@Override
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
@@ -211,6 +228,18 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		}
 	}
 
+	/**
+	 *  得到属性名
+	 * @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);
 		//如果鼠标移动到布局内且布局不可编辑，画出编辑蒙层

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

@@ -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/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/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

@@ -3,7 +3,7 @@ sonar.projectKey=finereport.design
 # this is the name displayed in the SonarQube UI
 sonar.projectName=finereport.design
 sonar.projectVersion=1.0
-sonar.branch=dev
+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.