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

designer_base/src/com/fr/design/actions/AllowAuthorityEditAction.java

@@ -1 +1 @@
-package com.fr.design.actions;

import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.designer.TargetComponent;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.mainframe.*;

/**
 * Author : daisy
 * Date: 13-8-30
 * Time: 上午10:12
 */
public class AllowAuthorityEditAction extends TemplateComponentAction {

    public AllowAuthorityEditAction(TargetComponent t) {
        super(t);
        this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
        this.setName(getMenuKeySet().getMenuName());
        this.setMnemonic(getMenuKeySet().getMnemonic());
        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit.png"));
    }

    /**
     * 撤销
     */
    public void prepare4Undo() {
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().iniAuthorityUndoState();
    }

    /**
     * 执行动作
     *
     * @return 是否执行成功
     */
    public boolean executeActionReturnUndoRecordNeeded() {
        TargetComponent tc = getEditingComponent();
        if (tc == null) {
            return false;
        }

        cleanAuthorityCondition();

        //进入时是格式刷则取消格式刷
        if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {
            tc.cancelFormat();
        }
        BaseUtils.setAuthorityEditing(true);
        ReportAndFSManagePane.getInstance().refreshDockingView();
        RolesAlreadyEditedPane.getInstance().refreshDockingView();
        WestRegionContainerPane.getInstance().replaceDownPane(ReportAndFSManagePane.getInstance());
        DesignerContext.getDesignerFrame().setCloseMode(UIConstants.CLOSE_OF_AUTHORITY);
        DesignerContext.getDesignerFrame().resetToolkitByPlus(tc.getToolBarMenuDockPlus());
        DesignerContext.getDesignerFrame().needToAddAuhtorityPaint();
        EastRegionContainerPane.getInstance().replaceUpPane(tc.getEastUpPane());
        DesignerContext.getDesignerFrame().refreshDottedLine();
        EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
        //画虚线
        return true;
    }


    /**
     * 进入权限编辑之前将权限编辑界面重置一下工具栏
     */
    private void cleanAuthorityCondition() {

        java.util.List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
        for (int i = 0; i < opendedTemplate.size(); i++) {
            opendedTemplate.get(i).cleanAuthorityUndo();
        }
    }

}
+package com.fr.design.actions;

import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.designer.TargetComponent;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.mainframe.*;

/**
 * Author : daisy
 * Date: 13-8-30
 * Time: 上午10:12
 */
public class AllowAuthorityEditAction extends TemplateComponentAction {

    public AllowAuthorityEditAction(TargetComponent t) {
        super(t);
        this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
        this.setName(getMenuKeySet().getMenuName());
        this.setMnemonic(getMenuKeySet().getMnemonic());
        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit.png"));
    }

    /**
     * 撤销
     */
    public void prepare4Undo() {
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().iniAuthorityUndoState();
    }

    /**
     * 执行动作
     *
     * @return 是否执行成功
     */
    public boolean executeActionReturnUndoRecordNeeded() {
        TargetComponent tc = getEditingComponent();
        if (tc == null) {
            return false;
        }

        cleanAuthorityCondition();

        //进入时是格式刷则取消格式刷
        if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {
            tc.cancelFormat();
        }
        BaseUtils.setAuthorityEditing(true);
        ReportAndFSManagePane.getInstance().refreshDockingView();
        RolesAlreadyEditedPane.getInstance().refreshDockingView();
        WestRegionContainerPane.getInstance().replaceDownPane(ReportAndFSManagePane.getInstance());
        DesignerContext.getDesignerFrame().setCloseMode(UIConstants.CLOSE_OF_AUTHORITY);
        DesignerContext.getDesignerFrame().resetToolkitByPlus(tc.getToolBarMenuDockPlus());
        DesignerContext.getDesignerFrame().needToAddAuhtorityPaint();
        EastRegionContainerPane.getInstance().replaceUpPane(tc.getEastUpPane());
        DesignerContext.getDesignerFrame().refreshDottedLine();
        EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
        EastRegionContainerPane.getInstance().removeParameterPane();

        //画虚线
        return true;
    }


    /**
     * 进入权限编辑之前将权限编辑界面重置一下工具栏
     */
    private void cleanAuthorityCondition() {

        java.util.List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
        for (int i = 0; i < opendedTemplate.size(); i++) {
            opendedTemplate.get(i).cleanAuthorityUndo();
        }
    }

}

designer_base/src/com/fr/design/actions/file/LocalePane.java

@@ -8,13 +8,7 @@ import java.awt.BorderLayout;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Vector;
 
 import javax.swing.JTable;
 import javax.swing.RowFilter;
@@ -31,10 +25,7 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.dialog.BasicPane;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.FRLogger;
+import com.fr.general.*;
-import com.fr.general.GeneralUtils;
-import com.fr.general.IOUtils;
-import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.project.ProjectConstants;
 
@@ -43,12 +34,6 @@ import com.fr.stable.project.ProjectConstants;
  * @since : 8.0
  */
 public class LocalePane extends BasicPane {
-    private static final String FR = "fr.properties";
-    private static final String US = "fr_en_US.properties";
-    private static final String CN = "fr_zh_CN.properties";
-    private static final String JP = "fr_ja_JP.properties";
-    private static final String TW = "fr_zh_TW.properties";
-    private static final String KR = "fr_ko_KR.properties";
     private static final String PREFIX = "fr_";
     private static final int LOCALE_NAME_LEN = 5;
 
@@ -124,39 +109,35 @@ public class LocalePane extends BasicPane {
     }
 
     private void initPredefinedProperties() {
-        Properties fr = loadLocaleProperties(FR);
+        Map<Locale, LocalePackage> map = Inter.getPredefinedPackageMap();
-        Properties us = loadLocaleProperties(US);
+        LocalePackage chinese = map.get(Locale.SIMPLIFIED_CHINESE);
-        Properties cn = loadLocaleProperties(CN);
+
-        Properties jp = loadLocaleProperties(JP);
+        List<String> sortKeys = new ArrayList<String>();
-        Properties tw = loadLocaleProperties(TW);
+
-        Properties kr = loadLocaleProperties(KR);
+
-
+        Set<ResourceBundle> bundles = chinese.getKindsOfResourceBundle();
-        Set<String> keys = fr.stringPropertyNames();
+        for (ResourceBundle bundle : bundles) {
-        List<String> sortKeys = new ArrayList<String>(keys);
+            sortKeys.addAll(bundle.keySet());
+        }
         Collections.sort(sortKeys);
-        Vector<String> keyVector = new Vector<String>();
+
-        Vector<String> valueVector = new Vector<String>();
+        Map<Locale, Vector<String>> data = new HashMap<Locale, Vector<String>>();
-        Vector<String> usVector = new Vector<String>();
+        for (Map.Entry<Locale, LocalePackage> entry : map.entrySet()) {
-        Vector<String> cnVector = new Vector<String>();
+            Vector<String> column = new Vector<String>();
-        Vector<String> jpVector = new Vector<String>();
+            for (String key : sortKeys) {
-        Vector<String> twVector = new Vector<String>();
+                column.add(entry.getValue().getLocText(key));
-        Vector<String> krVector = new Vector<String>();
+            }
-        for (String key : sortKeys) {
+            data.put(entry.getKey(), column);
-            keyVector.add(key);
-            valueVector.add(fr.getProperty(key));
-            usVector.add(us.getProperty(key));
-            cnVector.add(cn.getProperty(key));
-            jpVector.add(jp.getProperty(key));
-            twVector.add(tw.getProperty(key));
-            krVector.add(kr.getProperty(key));
         }
+
+        Vector<String> keyVector = new Vector<String>();
+        keyVector.addAll(sortKeys);
+
+
         predefineTableModel.addColumn(Inter.getLocText("Key"), keyVector);
-        predefineTableModel.addColumn(Inter.getLocText("Value"), valueVector);
+        for (Map.Entry<Locale, Vector<String>> entry : data.entrySet()) {
-        predefineTableModel.addColumn("en_US", usVector);
+            predefineTableModel.addColumn(entry.getKey().getDisplayName(), entry.getValue());
-        predefineTableModel.addColumn("zh_CN", cnVector);
+        }
-        predefineTableModel.addColumn("ja_JP", jpVector);
-        predefineTableModel.addColumn("zh_TW", twVector);
-        predefineTableModel.addColumn("ko_KR", krVector);
     }
 
     private void initCustomProperties() throws Exception {

designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -232,7 +232,6 @@ public class UIResizableContainer extends JPanel {
                     verticalToolPane.setBounds(0, 0, toolPaneHeight, getHeight());
                 }
             }
-
         }
 
         @Override
@@ -302,6 +301,15 @@ public class UIResizableContainer extends JPanel {
         return this.downPane;
     }
 
+    /**
+     * 得到参数面板
+     *
+     * @return
+     */
+    public JComponent getParameterPane() {
+        return this.parameterPane;
+    }
+
     /**
      * 刷新下面板
      */
@@ -343,7 +351,7 @@ public class UIResizableContainer extends JPanel {
                 public void mouseDragged(MouseEvent e) {
                     toolPaneY = e.getYOnScreen() - UIResizableContainer.this.getLocationOnScreen().y;
                     toolPaneY = toolPaneY < 0 ? 0 : toolPaneY;
-                    toolPaneY = toolPaneY > UIResizableContainer.this.getHeight() - toolPaneHeight ? UIResizableContainer.this.getHeight() - toolPaneHeight : toolPaneY;
+                    toolPaneY = toolPaneY > UIResizableContainer.this.getHeight() - toolPaneHeight ? UIResizableContainer.this.getHeight() - toolPaneHeight - getParameterPaneHeight() : toolPaneY - getParameterPaneHeight();
                     refreshContainer();
                 }
             });
@@ -366,7 +374,7 @@ public class UIResizableContainer extends JPanel {
                     if (e.getX() <= ARROW_RANGE) {
                         toolPaneY = 0;
                     } else if (e.getX() >= getWidth() - ARROW_RANGE) {
-                        toolPaneY = UIResizableContainer.this.getHeight() - toolPaneHeight;
+                        toolPaneY = UIResizableContainer.this.getHeight() - toolPaneHeight - getParameterPaneHeight();
                     } else {
                         return;
                     }

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

@@ -222,16 +222,16 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         return ChartTypeManager.getInstance().containsPlot(plotID);
     }
 
+
     /**
      * 把所有的pane加到list里
      *
      * @param paneList pane容器
      */
     public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends Chart>> paneList) {
-        Iterator iterator = chartTypeInterfaces.entrySet().iterator();
+        List<Integer> priorityList = getPriorityInOrder();
-        while (iterator.hasNext()) {
+        for (int i = 0; i < priorityList.size(); i++){
-            Map.Entry entry = (Map.Entry) iterator.next();
+            String priority = String.valueOf(priorityList.get(i));
-            String priority = (String) entry.getKey();
             Iterator chartUIIterator = chartTypeInterfaces.get(priority).entrySet().iterator();
             while (chartUIIterator.hasNext()) {
                 Map.Entry chartUIEntry = (Map.Entry) chartUIIterator.next();
@@ -276,32 +276,40 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     }
 
     private String[] getTitle4PopupWindow(){
-        List<Integer> priorityList = new ArrayList<Integer>();
+        List<Integer> priorityList = getPriorityInOrder();
+
+        if (priorityList.size() == 0){
+            return new String[0];
+        }
+
         int size = 0;
-        if (chartTypeInterfaces != null){
+        //获取总得图表格式
+        for (int i = 0; i < priorityList.size(); i++) {
+            size += getChartSize(String.valueOf(priorityList.get(i)));
+        }
+        String[] names = new String[size];
+
+        int index = 0;
+        for (int i = 0; i < priorityList.size(); i++){
+            String priority = String.valueOf(priorityList.get(i));
+            Iterator chartUI = chartTypeInterfaces.get(priority).entrySet().iterator();
+            index = fetchNames(chartUI, names, index);
+        }
+
+        return names;
+    }
+
+    private List<Integer> getPriorityInOrder() {
+        List<Integer> priorityList = new ArrayList<Integer>();
+        if (chartTypeInterfaces != null) {
             Iterator iterator = chartTypeInterfaces.entrySet().iterator();
-            while (iterator.hasNext()){
+            while (iterator.hasNext()) {
                 Map.Entry entry = (Map.Entry) iterator.next();
                 String priority = (String) entry.getKey();
                 priorityList.add(Integer.valueOf(priority));
-                size += getChartSize(priority);
             }
-            String[] names = new String[size];
-
-            priorityList = ChartTypeManager.orderInPriority(priorityList);
-
-            int index = 0;
-
-            for (int i = 0; i < priorityList.size(); i++){
-                String priority = String.valueOf(priorityList.get(i));
-                Iterator chartUI = chartTypeInterfaces.get(priority).entrySet().iterator();
-                index = fetchNames(chartUI, names, index);
-            }
-
-            return names;
         }
-
+        return ChartTypeManager.orderInPriority(priorityList);
-        return new String[0];
     }
 
     private int fetchNames(Iterator chartUI, String[] names, int index) {

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

@@ -308,19 +308,23 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
      * @param y 坐标y
      */
     public void fix(XCreator creator ,int x, int y) {
+		int height = creator.getHeight();
+		int width = creator.getWidth();
     	if (x < 0) {
+			width += x;
 			x = 0;
 		} else if (x + creator.getWidth() > container.getWidth()) {
-			x = container.getWidth() - creator.getWidth();
+			width = container.getWidth() - x;
 		}
 
 		if (y < 0) {
+			height += y;
 			y = 0;
 		} else if (y + creator.getHeight() > container.getHeight()) {
-			y = container.getHeight() - creator.getHeight();
+			height = container.getHeight() - y;
 		}
 
-		creator.setLocation(x, y);
+		creator.setBounds(x, y, width, height);
     }
 
     @Override

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

@@ -86,7 +86,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
                         .getLocText("Form-Widget_Name")),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
-                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        WLayoutBorderStyleEditor.class).setI18NName(
                         Inter.getLocText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 

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

@@ -66,7 +66,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
                         .getLocText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
-                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        WLayoutBorderStyleEditor.class).setI18NName(
                         Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 
@@ -76,7 +76,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
                             }
                         }),
                 new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
-                        .setRendererClass(PaddingMarginCellRenderer.class).setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
+                        .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                     };
 	}

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

@@ -2,9 +2,19 @@ package com.fr.design.designer.creator;
 
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter;
+import com.fr.design.form.util.XCreatorConstants;
+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.LayoutBorderStyle;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
+import com.fr.stable.core.PropertyChangeAdapter;
 
 import java.awt.*;
+import java.beans.IntrospectionException;
 
 /**
  * Created by zhouping on 2016/10/14.
@@ -52,4 +62,33 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     public boolean isSupportDrag() {
         return false;
     }
+
+    /**
+     * 得到属性名
+     *
+     * @return 属性名
+     * @throws java.beans.IntrospectionException
+     */
+    @Override
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        return  new CRPropertyDescriptor[] {
+                new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+                        .getLocText("FR-Designer_Form-Widget_Name")),
+                new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
+                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+                        .setPropertyChangeListener(new PropertyChangeAdapter() {
+
+                            @Override
+                            public void propertyChange() {
+                                initStyle();
+                            }
+                        })
+        };
+    }
+
+    @Override
+    protected void initStyle() {
+        initBorderStyle();
+    }
 }

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

@@ -283,7 +283,7 @@ public class XWCardLayout extends XLayoutContainer {
                     	   }
                        }),
                new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
-            		   CardTagWLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+            		   CardTagWLayoutBorderStyleEditor.class).setI18NName(
                        Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                        .setPropertyChangeListener(new PropertyChangeAdapter() {
 

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

@@ -64,7 +64,7 @@ public class XWTabFitLayout extends XWFitLayout {
 				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
 					        .getLocText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
-                       .setRendererClass(PaddingMarginCellRenderer.class).setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
+                       .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                     };
 	}

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

@@ -9,6 +9,7 @@ import com.fr.design.mainframe.widget.editors.LayoutTypeEditor;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WBodyLayoutType;
+import com.fr.general.FRLogger;
 import com.fr.general.FRScreen;
 import com.fr.general.Inter;
 
@@ -92,46 +93,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
             } else {
                 if (row == 0) {
                     if (state == WBodyLayoutType.FIT.getTypeValue()) {
-                        XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
+                        return switch2FitBodyLayout();
-                        //备份一下组件间隔
-                        int compInterval = xfl.toData().getCompInterval();
-                        Component[] components = xwAbsoluteLayout.getComponents();
-
-                        Arrays.sort(components, new ComparatorComponentLocation());
-
-                        xfl.getLayoutAdapter().removeBean(xwAbsoluteLayout, xwAbsoluteLayout.getWidth(), xwAbsoluteLayout.getHeight());
-                        xfl.remove(xwAbsoluteLayout);
-
-                        for (Component comp : components) {
-                            XCreator xCreator = (XCreator)comp;
-                            if (xCreator.shouldScaleCreator()){
-                                XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight());
-                                xfl.add(parentPanel, xCreator.toData().getWidgetName());
-                                parentPanel.updateChildBound(xfl.getActualMinHeight());
-                                continue;
-                            }
-                            xfl.add(xCreator);
-                        }
-                        //这边计算的时候会先把组件间隔去掉
-                        moveComponents2FitLayout(xfl);
-                        FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-                        formDesigner.getSelectionModel().setSelectedCreator(xfl);
-
-                        for (int i = 0; i < components.length; i++) {
-                            Component comp = xfl.getComponent(i);
-                            XCreator creator = (XCreator) comp;
-                            creator.setBackupBound(components[i].getBounds());
-                        }
-
-                        //把组件间隔加上
-                        if (xfl.toData().getCompInterval() != compInterval) {
-                            xfl.moveContainerMargin();
-                            xfl.moveCompInterval(xfl.getAcualInterval());
-                            xfl.toData().setCompInterval(compInterval);
-                            xfl.addCompInterval(xfl.getAcualInterval());
-                        }
-                        xfl.toData().setLayoutType(WBodyLayoutType.FIT);
-                        return true;
                     }
                 }
                 if (row == 1) {
@@ -166,7 +128,57 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         return true;
     }
 
-    //把绝对布局中的元素按规则移动到自适应布局中
+    private boolean switch2FitBodyLayout() {
+        try {
+            XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
+            //备份一下组件间隔
+            int compInterval = xfl.toData().getCompInterval();
+            Component[] components = xwAbsoluteLayout.getComponents();
+
+            Arrays.sort(components, new ComparatorComponentLocation());
+
+            xfl.getLayoutAdapter().removeBean(xwAbsoluteLayout, xwAbsoluteLayout.getWidth(), xwAbsoluteLayout.getHeight());
+            xfl.remove(xwAbsoluteLayout);
+
+            for (Component comp : components) {
+                XCreator xCreator = (XCreator) comp;
+                if (xCreator.shouldScaleCreator()) {
+                    XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight());
+                    xfl.add(parentPanel, xCreator.toData().getWidgetName());
+                    parentPanel.updateChildBound(xfl.getActualMinHeight());
+                    continue;
+                }
+                xfl.add(xCreator);
+            }
+            //这边计算的时候会先把组件间隔去掉
+            moveComponents2FitLayout(xfl);
+            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+            formDesigner.getSelectionModel().setSelectedCreator(xfl);
+
+            for (int i = 0; i < components.length; i++) {
+                Component comp = xfl.getComponent(i);
+                XCreator creator = (XCreator) comp;
+                creator.setBackupBound(components[i].getBounds());
+            }
+
+            //把组件间隔加上
+            if (xfl.toData().getCompInterval() != compInterval) {
+                xfl.moveContainerMargin();
+                xfl.moveCompInterval(xfl.getAcualInterval());
+                xfl.toData().setCompInterval(compInterval);
+                xfl.addCompInterval(xfl.getAcualInterval());
+            }
+            xfl.toData().setLayoutType(WBodyLayoutType.FIT);
+            return true;
+        }
+        catch (Exception e){
+            FRLogger.getLogger().error(e.getMessage());
+            return false;
+        }
+    }
+
+    // 把绝对布局中的元素按规则移动到自适应布局中
+    // 规则：各元素按顺序放置，其中每行最多4个元素，超出则换行，各元素均分body的高度和宽度
     private void moveComponents2FitLayout(XWFitLayout xwFitLayout) {
         int eachRowCount = 4;
         Component[] components = xwFitLayout.getComponents();

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

@@ -1,10 +1,18 @@
 package com.fr.design.designer.properties;
 
+import com.fr.design.designer.beans.AdapterBus;
+import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor;
 import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.utils.ComponentUtils;
+import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.Inter;
 
@@ -23,6 +31,7 @@ import java.awt.*;
 //控件在自适应布局中宽度、高度属性，7.1.1不可编辑
 public class FRFitLayoutConstraints implements ConstraintsGroupModel {
     private static final int MINHEIGHT = XCreator.SMALL_PREFERRED_SIZE.height;
+    private static final int MINWIDTH = XCreator.SMALL_PREFERRED_SIZE.width;
     private static final int ROWNUM = 2;
 
     private DefaultTableCellRenderer renderer;
@@ -80,12 +89,18 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
     public boolean setValue(Object value, int row, int column) {
         if (column == 1) {
             int v = value == null ? 0 : ((Number) value).intValue();
-            Rectangle bounds = new Rectangle(xCreator.getBounds());
+            int difference =  0;
+            Rectangle bounds = getBounds();
             switch (row) {
                 case 0:
+                    if(v < MINWIDTH){
+                        JOptionPane.showMessageDialog(null, Inter.getLocText("Min-Width") + Integer.toString(MINWIDTH));
+                        v = xCreator.getWidth();
+                    }
                     if (bounds.width == v){
                         return false;
                     }
+                    difference = bounds.width - v;
                     bounds.width = v;
                     break;
                 case 1:
@@ -96,25 +111,44 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
                     if (bounds.height == v){
                         return false;
                     }
+                    difference = bounds.height - v;
                     bounds.height = v;
                     break;
             }
             WFitLayout wFitLayout = parent.toData();
             wFitLayout.setBounds(xCreator.toData(),bounds);
-            xCreator.setBounds(bounds);
+            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-
+            Rectangle backupBounds = getBounds();
+            FRFitLayoutAdapter layoutAdapter = (FRFitLayoutAdapter) AdapterBus.searchLayoutAdapter(formDesigner, xCreator);
+            if (layoutAdapter != null) {
+                layoutAdapter.calculateBounds(backupBounds, bounds, xCreator, row, difference);
+            }
             return true;
         } else {
             return false;
         }
     }
 
+    public Rectangle getBounds(){
+        Rectangle bounds = new Rectangle(xCreator.getBounds());
+        XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(xCreator);
+        if (parent == null) {
+            return bounds;
+        }
+        Rectangle rec = ComponentUtils.getRelativeBounds(parent);
+        bounds.x += rec.x;
+        bounds.y += rec.y;
+        return bounds;
+
+    }
+
     /**
      * 该行是否可编辑
      * @param row  行
      * @return 第row行可编辑返回true，否则返回false
      */
     public boolean isEditable(int row) {
-        return false;
+        return true;
     }
+
 }

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

@@ -17,6 +17,7 @@ import com.fr.form.ui.container.WAbsoluteBodyLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
+import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 
 import javax.swing.table.DefaultTableCellRenderer;
@@ -145,34 +146,38 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 				layout.setCompState(state);
 				return true;
 			}else if (row == 0) {
-				layout.setLayoutType(WBodyLayoutType.parse(state));
+				try {
-				if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
+					if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
-					WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
+						WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
-					wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
+						wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
-					Component[] components = xfl.getComponents();
+						Component[] components = xfl.getComponents();
-					xfl.removeAll();
+						xfl.removeAll();
-					XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0,0));
+						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
-					xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
+						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
-					for (Component component : components) {
+						for (Component component : components) {
-						XCreator xCreator = (XCreator)component;
+							XCreator xCreator = (XCreator) component;
-						//部分控件被ScaleLayout包裹着，绝对布局里面要放出来
+							//部分控件被ScaleLayout包裹着，绝对布局里面要放出来
-						if (xCreator.acceptType(XWScaleLayout.class)){
+							if (xCreator.acceptType(XWScaleLayout.class)) {
-							if (xCreator.getComponentCount() > 0 && ((XCreator)xCreator.getComponent(0)).shouldScaleCreator()) {
+								if (xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator()) {
-								component = xCreator.getComponent(0);
+									component = xCreator.getComponent(0);
-								component.setBounds(xCreator.getBounds());
+									component.setBounds(xCreator.getBounds());
+								}
 							}
+							xwAbsoluteBodyLayout.add(component);
 						}
-						xwAbsoluteBodyLayout.add(component);
+						FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+						formDesigner.getSelectionModel().setSelectedCreators(
+								FormSelectionUtils.rebuildSelection(xfl, new Widget[]{wAbsoluteBodyLayout}));
+					} else {
+						FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+						formDesigner.getSelectionModel().setSelectedCreators(
+								FormSelectionUtils.rebuildSelection(xfl, new Widget[]{xfl.toData()}));
 					}
-					FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+				}catch (Exception e){
-					formDesigner.getSelectionModel().setSelectedCreators(
+					FRLogger.getLogger().error(e.getMessage());
-							FormSelectionUtils.rebuildSelection(xfl, new Widget[]{wAbsoluteBodyLayout}));
+					return false;
-				}
-				else {
-					FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-					formDesigner.getSelectionModel().setSelectedCreators(
-							FormSelectionUtils.rebuildSelection(xfl, new Widget[]{xfl.toData()}));
 				}
+				layout.setLayoutType(WBodyLayoutType.parse(state));
 				return true;
 			}
 			return false;

designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java

@@ -230,14 +230,9 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
 		}
 		ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(
 				p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray());
-
 		EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this));
-		if (p.getParameterArray().length == 0) {
+		EastRegionContainerPane.getInstance().setParameterHeight(ParameterPropertyPane.getInstance(this).getPreferredSize().height);
-			EastRegionContainerPane.getInstance().setParameterHeight(30);
+
-		} else {
-			//参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度
-			EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80);
-		}
 	}
 
 	/**

designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java

@@ -280,7 +280,7 @@ public class LayoutBorderPane extends BasicPane {
             Constants.LINE_THICK, //3px
             };
 
-    public final static String[] BORDER_TYPE = new String[]{Inter.getLocText("FR-Designer-Widget-Style_Standard"), Inter.getLocText("FR-Designer-Widget-Style_Title")};
+    public final static String[] BORDER_TYPE = new String[]{Inter.getLocText("FR-Designer-Widget-Style_Standard"), Inter.getLocText("FR-Designer-Widget-Style_Custom")};
     public final static String[] BORDER_STYLE= new String[]{Inter.getLocText("FR-Designer-Widget-Style_Common"), Inter.getLocText("FR-Designer-Widget-Style_Shadow")};
 
     private final static Dimension BUTTON_SIZE = new Dimension(24, 20);

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

@@ -198,13 +198,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(
                 getParameterArray() == null ? new Parameter[0] : getParameterArray());
         ParameterPropertyPane.getInstance().repaintContainer();
-        if (getParameterArray().length == 0) {
+        EastRegionContainerPane.getInstance().setParameterHeight(ParameterPropertyPane.getInstance(this).getPreferredSize().height);
-            EastRegionContainerPane.getInstance().setParameterHeight(30);
-        } else {
-            //参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度
-            EastRegionContainerPane.getInstance().setParameterHeight((getParameterArray().length + 5) / 6 * 30 + 80);
-        }
-
     }
 
    private void removeSame(Parameter[] parameters, List<String> namelist){

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

@@ -79,7 +79,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 		this.componentTree = null;
 //		this.searchTextField = null;
 //		this.searchResult = null;
-		add(new JScrollPane(), BorderLayout.CENTER);
+//		add(new JScrollPane(), BorderLayout.CENTER);
 	}
 
 	@Override
@@ -109,7 +109,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 			adjustPosition(treeModel, formDesigner);
 		}
 		JPanel widgetPane = new JPanel();
-		widgetPane.setBorder(BorderFactory.createEmptyBorder(3, 0, 3, 0));
+		widgetPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
 		widgetPane.setLayout(FRGUIPaneFactory.createBorderLayout());
 		add(widgetPane, BorderLayout.NORTH);
 		widgetPane.add(new UILabel(Inter.getLocText("FR-Designer-Selected_Widget") + "  ",

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

@@ -657,7 +657,8 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      * @return 是则返回true
      */
     public boolean isSelectRootPane() {
-        return formDesign.getRootComponent() == formDesign.getSelectionModel().getSelection().getSelectedCreator();
+        return (formDesign.getRootComponent() == formDesign.getSelectionModel().getSelection().getSelectedCreator())
+                || (formDesign.getSelectionModel().getSelection().getSelectedCreator().acceptType(XWAbsoluteBodyLayout.class));
 
     }
 

designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java

@@ -47,7 +47,7 @@ public class ParameterPropertyPane extends JPanel{
 		initParameterListener();
 
         this.setLayout(new BorderLayout(0, 6));
-        this.setBorder(BorderFactory.createEmptyBorder(2, 5, 5, 5));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         this.add(toolbarPane, BorderLayout.CENTER);
 	}