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

.gitignore

@@ -3,5 +3,6 @@ designer_base/bin
 designer_chart/bin
 designer_form/bin
 *.iml
+designer_base/src/com/fr/design/locale/.idea
 
 

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

@@ -67,7 +67,12 @@ public class CellWidgetCardPane extends BasicPane {
         treeTabPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        attriTabPane.add(widgetPropertyPane, BorderLayout.NORTH);
+        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
+        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
+        northPane.add(basic);
+        basic.add(widgetPropertyPane);
+        attriTabPane.add(northPane, BorderLayout.NORTH);
         attriCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
         attriTabPane.add(attriCardPane, BorderLayout.CENTER);
         attriCardLayout = (CardLayout) attriCardPane.getLayout();
@@ -88,15 +93,6 @@ public class CellWidgetCardPane extends BasicPane {
             this.tabbedPane.setEnabled(true);
         }
 
-        attriTabPane.remove(widgetPropertyPane);
-        widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
-        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
-        northPane.add(basic);
-        basic.add(widgetPropertyPane);
-        attriTabPane.add(northPane, BorderLayout.NORTH);
-
         WidgetDefinePaneFactory.RN rn = WidgetDefinePaneFactory.createWidgetDefinePane(cellWidget, new Operator() {
             @Override
             public void did(DataCreatorUI ui, String cardName) {

designer_base/src/com/fr/design/actions/server/ConnectionListAction.java

@@ -8,6 +8,7 @@ import com.fr.data.impl.Connection;
 import com.fr.dav.LocalEnv;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionManagerPane;
+import com.fr.design.data.datapane.connect.ConnectionShowPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -25,7 +26,6 @@ import java.util.HashMap;
  * DatasourceList Action
  */
 public class ConnectionListAction extends UpdateAction {
-    private static final int BYTENUM = 1444;
 
     public ConnectionListAction() {
         this.setMenuKeySet(DEFINE_DATA_CONNECTION);
@@ -92,7 +92,10 @@ public class ConnectionListAction extends UpdateAction {
     }
 
 
-    private void writeFile(DatasourceManagerProvider datasourceManager) {
+    /**
+     * @param datasourceManager
+     */
+    public static void writeFile(DatasourceManagerProvider datasourceManager) {
         Env currentEnv = FRContext.getCurrentEnv();
         try {
             boolean isSuccess = currentEnv.writeResource(datasourceManager);
@@ -106,15 +109,17 @@ public class ConnectionListAction extends UpdateAction {
     }
 
     /**
-     * 是否正常更新完datasourceManager
+     * 更新datasourceManager
      *
-     * @param datasourceManager
+     * @param datasourceManager  datasource管理对象
-     * @param databaseManagerPane
+     * @param backupManager      datasource管理对象备份
-     * @return
+     * @param connectionShowPane datasource面板
+     * @param databaseListDialog datasource管理对话框
+     * @return boolean 是否更新成功
      */
-    private boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager backupManager,
+    public static boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager
-                                            ConnectionManagerPane databaseManagerPane, BasicDialog databaseListDialog) {
+            backupManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
-        databaseManagerPane.update(datasourceManager);
+        connectionShowPane.update(datasourceManager);
         HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails();
         modifyDetails.clear();
         Env currentEnv = FRContext.getCurrentEnv();
@@ -139,7 +144,7 @@ public class ConnectionListAction extends UpdateAction {
                         localModifiedTable.removeConfilct();
                         modifyDetails.clear();
                         //更新面板
-                        databaseManagerPane.populate(datasourceManager);
+                        connectionShowPane.populate(datasourceManager);
                     } else {
                         //更新失败，继续停留页面
                         isFailed = true;
@@ -152,7 +157,7 @@ public class ConnectionListAction extends UpdateAction {
         int index = datasourceManager.isConnectionMapContainsRename();
         if (index != -1) {
             isFailed = true;
-            databaseManagerPane.setSelectedIndex(index);
+            connectionShowPane.setSelectedIndex(index);
         }
         databaseListDialog.setDoOKSucceed(!isFailed);
         //如果修改成功，则去远程端增量修改修改表

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

@@ -18,9 +18,7 @@ public class MoveUtils {
 	public static final int SORPTION_UNIT = 5;
     private static final int EQUIDISTANTLINE_UNIT = 4;
 
-	public static WidgetForbidWindow widgetForbidWindow = new WidgetForbidWindow();
+    private static ArrayList<EquidistantLine> equidistantLines = new ArrayList<>();
-
-	public static ArrayList<EquidistantLine> equidistantLines = new ArrayList<>();
 
 	private MoveUtils() {
 
@@ -259,8 +257,7 @@ public class MoveUtils {
 				equidistantLineInfo.setReference(bounds.y);
 				equidistantLineInfo.setDirection(SwingConstants.BOTTOM);
 			}
-		}
+        } else if ((leftMiddleY > bounds.getY()) && (leftMiddleY < (bounds.getY() + bounds.getHeight()))) {
-		else if ((leftMiddleY > bounds.getY()) && (leftMiddleY < (bounds.getY() + bounds.getHeight()))){
 			//当前操作rec在bounds的右侧
 			if (left > (bounds.getX() + bounds.getWidth())){
 				equidistantLineInfo.setDistance(left - (bounds.x + bounds.width));
@@ -279,13 +276,6 @@ public class MoveUtils {
 		}
 	}
 
-	public static void displayForbidWindow(int x, int y) {
-		widgetForbidWindow.showWindow(x, y);
-	}
-
-	public static void hideForbidWindow() {
-		widgetForbidWindow.hideWindow();
-	}
 
 	/**
 	 * 吸附
@@ -318,25 +308,16 @@ public class MoveUtils {
 		RectangleIterator iterator = designer.createRectangleIterator();
 
 		java.util.List<Rectangle> cacheRecs = new ArrayList<Rectangle>();
-		//是否存在控件重叠
-		boolean isWidgetsIntersects = false;
         while (iterator.hasNext()) {
             Rectangle bounds = iterator.nextRectangle();
             cacheRecs.add(bounds);
-			boolean isIntersects = operatingRectangle.intersects(bounds);
             findX(px, bounds, left, right, width);
             findY(py, bounds, top, bottom, height);
 
-			if(!isParameterLayout){
+            if (!isParameterLayout) {
-				if(isIntersects) {
-					isWidgetsIntersects = true;
-				}
-				else{
                 findEquidistantLine(bounds, left, top, height, width);
             }
         }
-		}
-		showForbiddenWindow(designer, x, y, isWidgetsIntersects);
 
 		createXAbsorptionline(px, designer, width, cacheRecs);
 		createYAbsorptionline(py, designer, height, cacheRecs);
@@ -353,18 +334,6 @@ public class MoveUtils {
 		return sorptionPoint;
 	}
 
-	public static void showForbiddenWindow(RectangleDesigner designer, int x, int y, boolean isIntersects){
-		if (isIntersects){
-			if(designer.getDesignerLocationOnScreen() != null) {
-				displayForbidWindow(x + designer.getDesignerLocationOnScreen().x, y + designer.getDesignerLocationOnScreen().y);
-			}
-			designer.setWidgetsIntersected(true);
-		}
-		else{
-			designer.setWidgetsIntersected(false);
-			hideForbidWindow();
-		}
-	}
 
 	private static void createXAbsorptionline(PlacePointing px, RectangleDesigner designer, int width, java.util.List<Rectangle> cacheRecs) {
 		Absorptionline line = null;

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

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

designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -1,11 +1,11 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fr.base.Env;
 import com.fr.base.FRContext;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.server.ConnectionListAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.file.DatasourceManager;
@@ -17,6 +17,7 @@ import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -31,7 +32,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      */
     private static final long serialVersionUID = 1L;
     private Class<? extends Connection> cls; // 所取的Connection都是cls及其子类
-    private java.util.List<String> nameList = new ArrayList<String>();
+    private List<String> nameList = new ArrayList<String>();
 
     public ConnectionComboBoxPanel(Class<? extends Connection> cls) {
         super();
@@ -53,11 +54,11 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     /*
      * 刷新ComboBox.items
      */
-    protected java.util.Iterator<String> items() {
+    protected Iterator<String> items() {
         nameList = new ArrayList<String>();
 
         DatasourceManagerProvider mgr = DatasourceManager.getProviderInstance();
-        java.util.Iterator<String> nameIt = mgr.getConnectionNameIterator();
+        Iterator<String> nameIt = mgr.getConnectionNameIterator();
         while (nameIt.hasNext()) {
             String conName = nameIt.next();
             Connection connection = mgr.getConnection(conName);
@@ -71,7 +72,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
     }
 
-
     public int getConnectionSize() {
         return nameList.size();
     }
@@ -86,25 +86,37 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     protected void editItems() {
         final ConnectionListPane connectionListPane = new ConnectionListPane();
         final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance();
+        final DatasourceManager backupManager = datasourceManager.getBackUpManager();
         connectionListPane.populate(datasourceManager);
-        BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
+        final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
-                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), new DialogActionAdapter() {
+                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
+        connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
             public void doOk() {
-                connectionListPane.update(datasourceManager);
+                if (!connectionListPane.isNamePermitted()) {
+                    connectionListDialog.setDoOKSucceed(false);
+                    return;
+                }
+                if (!ConnectionListAction.doWithDatasourceManager(datasourceManager, backupManager, connectionListPane,
+                        connectionListDialog)) {
+                    //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
+                    return;
+                }
                 // marks:保存数据
-                Env currentEnv = FRContext.getCurrentEnv();
+                ConnectionListAction.writeFile(datasourceManager);
-                try {
-                    currentEnv.writeResource(datasourceManager);
-                } catch (Exception ex) {
-                    FRContext.getLogger().error(ex.getMessage(), ex);
             }
+
+            public void doCancel() {
+                datasourceManager.synchronizedWithServer();
             }
         });
         connectionListDialog.setVisible(true);
         refreshItems();
     }
 
-    public void populate(com.fr.data.impl.Connection connection) {
+    /**
+     * @param connection 数据库链接
+     */
+    public void populate(Connection connection) {
         editButton.setEnabled(FRContext.getCurrentEnv().isRoot());
         if (connection instanceof NameDatabaseConnection) {
             this.setSelectedItem(((NameDatabaseConnection) connection).getName());

designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -23,7 +23,7 @@ import java.util.*;
 /**
  * Connection List Pane.
  */
-public class ConnectionListPane extends JListControlPane {
+public class ConnectionListPane extends JListControlPane implements ConnectionShowPane {
     public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection");
     private boolean isNamePermitted = true;
     private HashMap<String, String> renameMap = new HashMap<String, String>();

designer_base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java

@@ -14,7 +14,7 @@ import java.awt.*;
 import java.io.File;
 import java.util.HashMap;
 
-public class ConnectionManagerPane extends LoadingBasicPane {
+public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
     private UITextField connectionTextField;
     private ConnectionListPane connectionListPane;
 
@@ -30,10 +30,10 @@ public class ConnectionManagerPane extends LoadingBasicPane {
         this.connectionTextField = new UITextField();
         connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
         this.connectionTextField.setEditable(false);
-        connectionListPane = new ConnectionListPane(){
+        connectionListPane = new ConnectionListPane() {
-            protected void rename(String oldName,String newName) {
+            protected void rename(String oldName, String newName) {
-                super.rename(oldName,newName);
+                super.rename(oldName, newName);
-                renameConnection(oldName,newName);
+                renameConnection(oldName, newName);
             }
         };
         container.add(connectionListPane, BorderLayout.CENTER);
@@ -69,6 +69,7 @@ public class ConnectionManagerPane extends LoadingBasicPane {
 
     /**
      * 名字是否允许
+     *
      * @return 允许返回true
      */
     public boolean isNamePermitted() {

designer_base/src/com/fr/design/data/datapane/connect/ConnectionShowPane.java

@@ -0,0 +1,15 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.file.DatasourceManagerProvider;
+
+/**
+ * Created by yaoh.wu on 2017/4/22.
+ * 数据链接显示面板
+ */
+public interface ConnectionShowPane {
+    void update(DatasourceManagerProvider datasourceManager);
+
+    void populate(DatasourceManagerProvider datasourceManager);
+
+    void setSelectedIndex(int index);
+}

designer_base/src/com/fr/design/formula/VariableResolverAdapter.java

@@ -4,12 +4,16 @@ import com.fr.base.ConfigManager;
 import com.fr.base.Parameter;
 import com.fr.design.DesignModelAdapter;
 import com.fr.base.ConfigManagerProvider;
+import com.fr.plugin.ExtraClassManager;
 import com.fr.script.ScriptConstants;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
+import com.fr.stable.fun.BuiltInParametersProvider;
 import com.fr.stable.script.CalculatorProvider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public abstract class VariableResolverAdapter implements VariableResolver {
 	private static final int TABLE_DATA_PARA = 0;
@@ -21,7 +25,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      * @return 内置参数
      */
 	public String[] resolveCurReportVariables() {
-		return new String[] { ScriptConstants.SUMMARY_TAG + "page_number",
+		String [] variables =  new String[] { ScriptConstants.SUMMARY_TAG + "page_number",
 				ScriptConstants.SUMMARY_TAG + "totalPage_number",
 				// 下面是权限相关的参数
 				ScriptConstants.DETAIL_TAG + Constants.P.PRIVILEGE_USERNAME, ScriptConstants.DETAIL_TAG + Constants.P.PRIVILEGE_AUTHORITY,
@@ -32,6 +36,13 @@ public abstract class VariableResolverAdapter implements VariableResolver {
 				CalculatorProvider.REPORT_NAME, CalculatorProvider.FORMLET_NAME, CalculatorProvider.SERVLET_URL, CalculatorProvider.SERVER_SCHEMA, CalculatorProvider.SERVER_NAME,
 				CalculatorProvider.SERVER_PORT, CalculatorProvider.SERVER_URL, CalculatorProvider.CONTEXT_PATH, CalculatorProvider.SESSION_ID
 		};
+		Set<BuiltInParametersProvider> set = ExtraClassManager.getInstance().getArray(BuiltInParametersProvider.XML_TAG);
+		for (BuiltInParametersProvider provider : set) {
+			return (String[]) ArrayUtils.addAll(variables, new String []{
+					ScriptConstants.DETAIL_TAG + provider.getParametersName()
+			});
+		}
+		return variables;
 	}
 	
 	private Parameter[] getCurrentModeParameters(int type) {

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

@@ -51,34 +51,16 @@ public class BorderPane extends AbstractBasicStylePane {
 	}
 
 	protected void initComponents() {
-		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
+		initButtonsWithIcon();
-		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
-		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
-		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
-		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
-		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
-		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
-		this.currentLineColorPane = new NewColorSelectBox(100);
-
 		this.setLayout(new BorderLayout(0, 6));
-
+		double p = TableLayout.PREFERRED, f = TableLayout.FILL;
-		double p = TableLayout.PREFERRED;
+		double[] columnSize1 = {p, f}, rowSize1 = {p, p};
-		double f = TableLayout.FILL;
-
-		double[] columnSize1 = {p, f};
-		double[] rowSize1 = {p, p};
-
-
 		Component[][] components1 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("Style") + ":"), currentLineCombo},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + ":"), currentLineCombo},
-				new Component[]{new UILabel(Inter.getLocText("Color") + ":"), currentLineColorPane},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + ":"), currentLineColorPane},
 		};
-
 		JPanel northPane = TableLayoutHelper.createTableLayoutPane(components1, rowSize1, columnSize1);
-
+		double[] columnSize2 = {p, f}, rowSize2 = {p, p};
-
-		double[] columnSize2 = {p, f};
-		double[] rowSize2 = {p, p};
 		JPanel externalPane = new JPanel(new GridLayout(0, 4));
 		externalPane.add(topToggleButton);
 		externalPane.add(leftToggleButton);
@@ -87,23 +69,15 @@ public class BorderPane extends AbstractBasicStylePane {
 		JPanel insidePane = new JPanel(new GridLayout(0, 2));
 		insidePane.add(horizontalToggleButton);
 		insidePane.add(verticalToggleButton);
-
-
 		Component[][] components2 = new Component[][]{
 				new Component[]{outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png")), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
 				new Component[]{externalPane, insidePane,}
 		};
 		JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components2, rowSize2, columnSize2);
-
 		this.setLayout(new BorderLayout(0, 6));
 		this.add(northPane, BorderLayout.NORTH);
 		this.add(centerPane, BorderLayout.CENTER);
-
-
-		this.currentLineColorPane.setSelectObject(Color.BLACK);
-
 		outerToggleButton.addChangeListener(new ChangeListener() {
-
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				boolean value = outerToggleButton.isSelected();
@@ -113,9 +87,7 @@ public class BorderPane extends AbstractBasicStylePane {
 				rightToggleButton.setSelected(value);
 			}
 		});
-
 		innerToggleButton.addChangeListener(new ChangeListener() {
-
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				boolean value = innerToggleButton.isSelected();
@@ -123,12 +95,22 @@ public class BorderPane extends AbstractBasicStylePane {
 				verticalToggleButton.setSelected(value);
 			}
 		});
+	}
 
+	private void initButtonsWithIcon(){
+		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
+		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
+		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
+		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
+		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
+		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
+		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+		this.currentLineColorPane = new NewColorSelectBox(100);
 	}
 
 	@Override
 	public String title4PopupWindow() {
-		return Inter.getLocText("Border");
+		return Inter.getLocText("FR-Designer_Border");
 	}
 
 	public void populate(Style style) {

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -529,12 +529,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     protected boolean saveNewFile(FILE editingFILE, String oldName){
-        this.editingFILE = editingFILE;
+        // 在保存之前，初始化 templateID
+        initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
 
+        this.editingFILE = editingFILE;
         boolean result = this.saveFile();
         if (result) {
             DesignerFrameFileDealerPane.getInstance().refresh();
-            initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
             collectInfo();
         }
         //更换最近打开

designer_base/src/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java

@@ -26,17 +26,16 @@ import java.awt.geom.Rectangle2D;
 public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 
 	private int patternIndex = 0; // pattern setIndex.
+	private final static int DEFAULT_DIM_HEIGHT = 190;
 	private ColorSelectBox foregroundColorPane;
 	private ColorSelectBox backgroundColorPane;
 	private PatternButton[] patternButtonArray;
 
 	public PatternBackgroundQuickPane() {
 		this.setLayout(new BorderLayout(0, 4));
-
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
 		this.add(contentPane, BorderLayout.NORTH);
 		contentPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
-
 		JPanel typePane2 = new JPanel();
 		contentPane.add(typePane2);
 		typePane2.setLayout(new GridLayout(0, 8, 1, 1));
@@ -48,15 +47,11 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 			patternButtonGroup.add(patternButtonArray[i]);
 			typePane2.add(patternButtonArray[i]);
 		}
-
 		JPanel colorPane = new JPanel(new GridLayout(0, 2));
 		foregroundColorPane = new ColorSelectBox(70);
 		backgroundColorPane = new ColorSelectBox(70);
-		foregroundColorPane.setSelectObject(Color.lightGray);
+		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Foreground") + ":", foregroundColorPane));
-		backgroundColorPane.setSelectObject(Color.black);
+		colorPane.add(this.createLabelColorPane(Inter.getLocText("FR-Designer_Background") + ":", backgroundColorPane));
-
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("Foreground") + ":", foregroundColorPane));
-		colorPane.add(this.createLabelColorPane(Inter.getLocText("Background") + ":", backgroundColorPane));
 		this.add(colorPane, BorderLayout.CENTER);
 		foregroundColorPane.addSelectChangeListener(colorChangeListener);
 		backgroundColorPane.addSelectChangeListener(colorChangeListener);
@@ -65,7 +60,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 	@Override
 	public Dimension getPreferredSize() {
 		Dimension dim = super.getPreferredSize();
-		dim.height = 190;
+		dim.height = DEFAULT_DIM_HEIGHT;
 		return dim;
 	}
 
@@ -206,6 +201,6 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
 
 	@Override
 	public String title4PopupWindow() {
-		return Inter.getLocText("Background-Pattern");
+		return Inter.getLocText("FR-Designer_Background-Pattern");
 	}
 }

designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java

@@ -6,32 +6,56 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.env.RemoteEnv;
-import com.fr.general.ComparatorUtils;
+import com.fr.general.*;
-import com.fr.general.FRLogger;
-import com.fr.general.GeneralUtils;
-import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.stable.*;
-import org.json.JSONObject;
+import com.fr.stable.xml.*;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import com.fr.json.JSONObject;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.HashMap;
 
 /**
  * 做模板的过程和耗时收集，辅助类
  * Created by plough on 2017/2/21.
  */
-public class TemplateInfoCollector<T extends IOFile> implements Serializable {
+public class TemplateInfoCollector<T extends IOFile> implements Serializable, XMLReadable, XMLWriter {
-    private static final String FILE_NAME = "tplInfo.ser";
+    private static final String FILE_NAME = "tpl.info";
+    private static final String OBJECT_FILE_NAME = "tplInfo.ser";
     private static TemplateInfoCollector instance;
-    private HashMap<String, HashMap<String, Object>> templateInfoList;
+    private Map<String, HashMap<String, Object>> templateInfoList;
     private String designerOpenDate;  //设计器最近一次打开日期
     private static final int VALID_CELL_COUNT = 5;  // 有效报表模板的格子数
     private static final int VALID_WIDGET_COUNT = 5;  // 有效报表模板的控件数
     private static final int COMPLETE_DAY_COUNT = 15;  // 判断模板是否完成的天数
     private static final int ONE_THOUSAND = 1000;
     static final long serialVersionUID = 2007L;
+    private static final String XML_DESIGNER_OPEN_DATE = "DesignerOpenDate";
+    private static final String XML_TEMPLATE_INFO_LIST = "TemplateInfoList";
+    private static final String XML_TEMPLATE_INFO = "TemplateInfo";
+    private static final String XML_PROCESS_MAP = "processMap";
+    private static final String XML_CONSUMING_MAP = "consumingMap";
+    private static final String ATTR_DAY_COUNT = "day_count";
+    private static final String ATTR_TEMPLATE_ID = "templateID";
+    private static final String ATTR_PROCESS = "process";
+    private static final String ATTR_FLOAT_COUNT = "float_count";
+    private static final String ATTR_WIDGET_COUNT = "widget_count";
+    private static final String ATTR_CELL_COUNT = "cell_count";
+    private static final String ATTR_BLOCK_COUNT = "block_count";
+    private static final String ATTR_REPORT_TYPE = "report_type";
+    private static final String ATTR_ACTIVITYKEY = "activitykey";
+    private static final String ATTR_JAR_TIME = "jar_time";
+    private static final String ATTR_CREATE_TIME = "create_time";
+    private static final String ATTR_UUID = "uuid";
+    private static final String ATTR_TIME_CONSUME = "time_consume";
+    private static final String ATTR_VERSION = "version";
+    private static final String ATTR_USERNAME = "username";
+    private static final String JSON_CONSUMING_MAP = "jsonConsumingMap";
+    private static final String JSON_PROCESS_MAP = "jsonProcessMap";
+
 
     @SuppressWarnings("unchecked")
     private TemplateInfoCollector() {
@@ -61,29 +85,57 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FILE_NAME));
     }
 
+    private static File getObjectInfoFile() {
+        return new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), OBJECT_FILE_NAME));
+    }
+
     public static TemplateInfoCollector getInstance() {
         if (instance == null) {
-            // 先尝试从文件读取
-            try{
-                ObjectInputStream is = new ObjectInputStream(new FileInputStream(getInfoFile()));
-                instance = (TemplateInfoCollector) is.readObject();
-            } catch (FileNotFoundException ex) {
-                // 如果之前没有存储过，则创建新对象
-                instance = new TemplateInfoCollector();
-            } catch (InvalidClassException ex) {
-                // 如果 TemplateInfoCollecor 类结构有改动，则放弃之前收集的数据（下次保存时覆盖）
-                // 这种情况主要在开发、测试过程中遇到，正式上线后不应该出现
-                FRLogger.getLogger().info(ex.getMessage());
-                FRLogger.getLogger().info("use a new instance");
             instance = new TemplateInfoCollector();
+            readXMLFile(instance, getInfoFile());
+            // 兼容过渡。如果没有新文件，则从老文件读取数据。以后都是读写新的 xml 文件
+            if (!getInfoFile().exists() && getObjectInfoFile().exists()) {
+                try {
+                    ObjectInputStream is = new ObjectInputStream(new FileInputStream(getObjectInfoFile()));
+                    instance = (TemplateInfoCollector) is.readObject();
+                } catch (Exception ex) {
+                    // 什么也不做，instance 使用新值
                 }
-            catch (Exception ex) {
-                FRLogger.getLogger().error(ex.getMessage(), ex);
             }
         }
         return instance;
     }
 
+    private static void readXMLFile(XMLReadable xmlReadable, File xmlFile){
+        if (xmlFile == null || !xmlFile.exists()) {
+            return;
+        }
+        String charset = EncodeConstants.ENCODING_UTF_8;
+        try {
+            String fileContent = getFileContent(xmlFile);
+            InputStream xmlInputStream = new ByteArrayInputStream(fileContent.getBytes(charset));
+            InputStreamReader inputStreamReader = new InputStreamReader(xmlInputStream, charset);
+            XMLableReader xmlReader = XMLableReader.createXMLableReader(inputStreamReader);
+
+            if (xmlReader != null) {
+                xmlReader.readXMLObject(xmlReadable);
+            }
+            xmlInputStream.close();
+        } catch (FileNotFoundException e) {
+            FRContext.getLogger().error(e.getMessage());
+        } catch (IOException e) {
+            FRContext.getLogger().error(e.getMessage());
+        } catch (XMLStreamException e) {
+            FRContext.getLogger().error(e.getMessage());
+        }
+
+    }
+
+    private static String getFileContent(File xmlFile) throws FileNotFoundException, UnsupportedEncodingException{
+        InputStream is = new FileInputStream(xmlFile);
+        return IOUtils.inputStream2String(is);
+    }
+
     private boolean shouldCollectInfo() {
         if (FRContext.getCurrentEnv() instanceof RemoteEnv) {  // 远程设计不收集数据
             return false;
@@ -106,8 +158,8 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
      */
     @SuppressWarnings("unchecked")
     public String loadProcess(T t) {
-        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfoList.get(t.getTemplateID()).get("processMap");
+        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfoList.get(t.getTemplateID()).get(XML_PROCESS_MAP);
-        return (String)processMap.get("process");
+        return (String)processMap.get(ATTR_PROCESS);
     }
 
     /**
@@ -122,17 +174,8 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
      */
     private void saveInfo() {
         try {
-            ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream(getInfoFile()));
+            FileOutputStream out = new FileOutputStream(getInfoFile());
-            String log = "";
+            XMLTools.writeOutputStreamXML(this, out);
-            int count = 1;
-            for (String key : templateInfoList.keySet()) {
-                String createTime = ((HashMap)templateInfoList.get(key).get("consumingMap")).get("create_time").toString();
-                log += (count + ". id: " + key + " " + createTime + "\n" + templateInfoList.get(key).toString() + "\n");
-                count ++;
-            }
-            FRLogger.getLogger().info("writing tplInfo: \n" + log);
-            os.writeObject(instance);
-            os.close();
         } catch (Exception ex) {
             FRLogger.getLogger().error(ex.getMessage());
         }
@@ -145,8 +188,8 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         if (designerOpenFirstTime()) {
             for (String key : templateInfoList.keySet()) {
                 HashMap<String, Object> templateInfo = templateInfoList.get(key);
-                int dayCount = (int)templateInfo.get("day_count") + 1;
+                int dayCount = (int)templateInfo.get(ATTR_DAY_COUNT) + 1;
-                templateInfo.put("day_count", dayCount);
+                templateInfo.put(ATTR_DAY_COUNT, dayCount);
             }
             setDesignerOpenDate();
         }
@@ -170,21 +213,20 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         if (inList(t)) { // 已有记录
             templateInfo = templateInfoList.get(t.getTemplateID());
             // 更新 conusmingMap
-            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get("consumingMap");
+            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get(XML_CONSUMING_MAP);
-            timeConsume += (long)consumingMap.get("time_consume");  // 加上之前的累计编辑时间
+            timeConsume += (long)consumingMap.get(ATTR_TIME_CONSUME);  // 加上之前的累计编辑时间
-            consumingMap.put("time_consume", timeConsume);
+            consumingMap.put(ATTR_TIME_CONSUME, timeConsume);
         }
         else {  // 新增
             templateInfo = new HashMap<>();
-            templateInfo.put("consumingMap", getNewConsumingMap(templateID, openTime, timeConsume));
+            templateInfo.put(XML_CONSUMING_MAP, getNewConsumingMap(templateID, openTime, timeConsume));
         }
 
         // 直接覆盖 processMap
-        templateInfo.put("processMap", getProcessMap(templateID, jt));
+        templateInfo.put(XML_PROCESS_MAP, getProcessMap(templateID, jt));
 
         // 保存模板时，让 day_count 归零
-        templateInfo.put("day_count", 0);
+        templateInfo.put(ATTR_DAY_COUNT, 0);
-
 
         templateInfoList.put(templateID, templateInfo);
 
@@ -200,14 +242,14 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(Calendar.getInstance().getTime());
         String jarTime = GeneralUtils.readBuildNO();
         String version = ProductConstants.VERSION;
-        consumingMap.put("username", username);
+        consumingMap.put(ATTR_USERNAME, username);
-        consumingMap.put("uuid", uuid);
+        consumingMap.put(ATTR_UUID, uuid);
-        consumingMap.put("activitykey", activitykey);
+        consumingMap.put(ATTR_ACTIVITYKEY, activitykey);
-        consumingMap.put("templateID", templateID);
+        consumingMap.put(ATTR_TEMPLATE_ID, templateID);
-        consumingMap.put("create_time", createTime);
+        consumingMap.put(ATTR_CREATE_TIME, createTime);
-        consumingMap.put("time_consume", timeConsume);
+        consumingMap.put(ATTR_TIME_CONSUME, timeConsume);
-        consumingMap.put("jar_time", jarTime);
+        consumingMap.put(ATTR_JAR_TIME, jarTime);
-        consumingMap.put("version", version);
+        consumingMap.put(ATTR_VERSION, version);
 
         return consumingMap;
     }
@@ -215,15 +257,15 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
     private HashMap<String, Object> getProcessMap(String templateID, JTemplate jt) {
         HashMap<String, Object> processMap = new HashMap<>();
 
-        processMap.put("templateID", templateID);
+        processMap.put(ATTR_TEMPLATE_ID, templateID);
-        processMap.put("process", jt.getProcess());
+        processMap.put(ATTR_PROCESS, jt.getProcess());
 
         TemplateProcessInfo info = jt.getProcessInfo();
-        processMap.put("report_type", info.getReportType());
+        processMap.put(ATTR_REPORT_TYPE, info.getReportType());
-        processMap.put("cell_count", info.getCellCount());
+        processMap.put(ATTR_CELL_COUNT, info.getCellCount());
-        processMap.put("float_count", info.getFloatCount());
+        processMap.put(ATTR_FLOAT_COUNT, info.getFloatCount());
-        processMap.put("block_count", info.getBlockCount());
+        processMap.put(ATTR_BLOCK_COUNT, info.getBlockCount());
-        processMap.put("widget_count", info.getWidgetCount());
+        processMap.put(ATTR_WIDGET_COUNT, info.getWidgetCount());
 
         return processMap;
     }
@@ -237,14 +279,11 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         String processUrl = SiteCenter.getInstance().acquireUrlByKind("tempinfo.process") + "/single";
         ArrayList<HashMap<String, String>> completeTemplatesInfo = getCompleteTemplatesInfo();
         for (HashMap<String, String> templateInfo : completeTemplatesInfo) {
-            String jsonConsumingMap = templateInfo.get("jsonConsumingMap");
+            String jsonConsumingMap = templateInfo.get(JSON_CONSUMING_MAP);
-            String jsonProcessMap = templateInfo.get("jsonProcessMap");
+            String jsonProcessMap = templateInfo.get(JSON_PROCESS_MAP);
             if (sendSingleTemplateInfo(consumingUrl, jsonConsumingMap) && sendSingleTemplateInfo(processUrl, jsonProcessMap)) {
                 // 清空记录
-                FRLogger.getLogger().info("successfully send " + templateInfo.get("templateID"));
+                removeFromTemplateInfoList(templateInfo.get(ATTR_TEMPLATE_ID));
-                removeFromTemplateInfoList(templateInfo.get("templateID"));
-            } else {
-                FRLogger.getLogger().info("send template info failed, will try next time, " + templateInfo.get("templateID"));
             }
         }
         saveInfo();
@@ -264,7 +303,12 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         }
 
         String res =  httpClient.getResponseText();
-        boolean success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        boolean success;
+        try {
+            success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        } catch (Exception ex) {
+            success = false;
+        }
         return success;
     }
 
@@ -277,21 +321,21 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         ArrayList<String> testTemplateKeys = new ArrayList<>();  // 保存测试模板的key
         for (String key : templateInfoList.keySet()) {
             HashMap<String, Object> templateInfo = templateInfoList.get(key);
-            if ((int)templateInfo.get("day_count") <= COMPLETE_DAY_COUNT) {  // 未完成模板
+            if ((int)templateInfo.get(ATTR_DAY_COUNT) <= COMPLETE_DAY_COUNT) {  // 未完成模板
                 continue;
             }
             if (isTestTemplate(templateInfo)) {
                 testTemplateKeys.add(key);
                 continue;
             }
-            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get("consumingMap");
+            HashMap<String, Object> consumingMap = (HashMap<String, Object>) templateInfo.get(XML_CONSUMING_MAP);
-            HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get("processMap");
+            HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get(XML_PROCESS_MAP);
             String jsonConsumingMap = new JSONObject(consumingMap).toString();
             String jsonProcessMap = new JSONObject(processMap).toString();
             HashMap<String, String> jsonTemplateInfo = new HashMap<>();
-            jsonTemplateInfo.put("jsonConsumingMap", jsonConsumingMap);
+            jsonTemplateInfo.put(JSON_CONSUMING_MAP, jsonConsumingMap);
-            jsonTemplateInfo.put("jsonProcessMap", jsonProcessMap);
+            jsonTemplateInfo.put(JSON_PROCESS_MAP, jsonProcessMap);
-            jsonTemplateInfo.put("templateID", key);
+            jsonTemplateInfo.put(ATTR_TEMPLATE_ID, key);
             completeTemplatesInfo.add(jsonTemplateInfo);
         }
         // 删除测试模板
@@ -303,17 +347,16 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
 
     private void removeFromTemplateInfoList(String key) {
         templateInfoList.remove(key);
-        FRLogger.getLogger().info(key + " is removed...");
     }
 
     @SuppressWarnings("unchecked")
     private boolean isTestTemplate(HashMap<String, Object> templateInfo) {
-        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get("processMap");
+        HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get(XML_PROCESS_MAP);
-        int reportType = (int)processMap.get("report_type");
+        int reportType = (int)processMap.get(ATTR_REPORT_TYPE);
-        int cellCount = (int)processMap.get("cell_count");
+        int cellCount = (int)processMap.get(ATTR_CELL_COUNT);
-        int floatCount = (int)processMap.get("float_count");
+        int floatCount = (int)processMap.get(ATTR_FLOAT_COUNT);
-        int blockCount = (int)processMap.get("block_count");
+        int blockCount = (int)processMap.get(ATTR_BLOCK_COUNT);
-        int widgetCount = (int)processMap.get("widget_count");
+        int widgetCount = (int)processMap.get(ATTR_WIDGET_COUNT);
         boolean isTestTemplate = false;
         if (reportType == 0) {  // 普通报表
             isTestTemplate = cellCount <= VALID_CELL_COUNT && floatCount <= 1 && widgetCount <= VALID_WIDGET_COUNT;
@@ -325,6 +368,157 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         return isTestTemplate;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void readXML(XMLableReader reader) {
+        if (reader.isChildNode()) {
+            try {
+                String name = reader.getTagName();
+                if (XML_DESIGNER_OPEN_DATE.equals(name)) {
+                    this.designerOpenDate = reader.getElementValue();
+                } else if(XML_TEMPLATE_INFO_LIST.equals(name)){
+                    readTemplateInfoList(reader);
+                }
+            } catch (Exception ex) {
+                // 什么也不做，使用默认值
+            }
+        }
+    }
+
+    private void readTemplateInfoList(XMLableReader reader) {
+        reader.readXMLObject(new XMLReadable() {
+            public void readXML(XMLableReader reader) {
+                if (XML_TEMPLATE_INFO.equals(reader.getTagName())) {
+                    TemplateInfo templateInfo = new TemplateInfo();
+                    reader.readXMLObject(templateInfo);
+                    templateInfoList.put(templateInfo.getTemplateID(), templateInfo.getTemplateInfo());
+                }
+            }
+        });
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG("TplInfo");
+
+        writer.startTAG(XML_DESIGNER_OPEN_DATE);
+        writer.textNode(designerOpenDate);
+        writer.end();
+
+        writeTemplateInfoList(writer);
+
+        writer.end();
+    }
+
+    private void writeTemplateInfoList(XMLPrintWriter writer){
+        //启停
+        writer.startTAG(XML_TEMPLATE_INFO_LIST);
+        for (String templateID : templateInfoList.keySet()) {
+            new TemplateInfo(templateInfoList.get(templateID)).writeXML(writer);
+        }
+        writer.end();
+    }
+
+    private class TemplateInfo implements XMLReadable, XMLWriter {
+
+        private int dayCount;
+        private String templateID;
+        private HashMap<String, Object> processMap = new HashMap<>();
+        private HashMap<String, Object> consumingMap = new HashMap<>();
+
+        @SuppressWarnings("unchecked")
+        public TemplateInfo(HashMap<String, Object> templateInfo) {
+            this.dayCount = (int)templateInfo.get(ATTR_DAY_COUNT);
+            this.processMap = (HashMap<String, Object>) templateInfo.get(XML_PROCESS_MAP);
+            this.consumingMap = (HashMap<String, Object>) templateInfo.get(XML_CONSUMING_MAP);
+            this.templateID = (String) processMap.get(ATTR_TEMPLATE_ID);
+        }
+
+        public TemplateInfo() {}
+
+        public String getTemplateID() {
+            return templateID;
+        }
+
+        public HashMap<String, Object> getTemplateInfo() {
+            HashMap<String, Object> templateInfo = new HashMap<>();
+            templateInfo.put(XML_PROCESS_MAP, processMap);
+            templateInfo.put(XML_CONSUMING_MAP, consumingMap);
+            templateInfo.put(ATTR_DAY_COUNT, dayCount);
+            return templateInfo;
+        }
+
+        public void writeXML(XMLPrintWriter writer) {
+            writer.startTAG(XML_TEMPLATE_INFO);
+            if (StringUtils.isNotEmpty(templateID)) {
+                writer.attr(ATTR_TEMPLATE_ID, this.templateID);
+            }
+            if (dayCount >= 0) {
+                writer.attr(ATTR_DAY_COUNT, this.dayCount);
+            }
+            writeProcessMap(writer);
+            writeConsumingMap(writer);
+
+            writer.end();
+        }
+
+        private void writeProcessMap(XMLPrintWriter writer) {
+            writer.startTAG(XML_PROCESS_MAP);
+            writer.attr(ATTR_PROCESS, (String)processMap.get(ATTR_PROCESS));
+            writer.attr(ATTR_FLOAT_COUNT, (int)processMap.get(ATTR_FLOAT_COUNT));
+            writer.attr(ATTR_WIDGET_COUNT, (int)processMap.get(ATTR_WIDGET_COUNT));
+            writer.attr(ATTR_CELL_COUNT, (int)processMap.get(ATTR_CELL_COUNT));
+            writer.attr(ATTR_BLOCK_COUNT, (int)processMap.get(ATTR_BLOCK_COUNT));
+            writer.attr(ATTR_REPORT_TYPE, (int)processMap.get(ATTR_REPORT_TYPE));
+            writer.end();
+        }
+
+        private void writeConsumingMap(XMLPrintWriter writer) {
+            writer.startTAG(XML_CONSUMING_MAP);
+            writer.attr(ATTR_ACTIVITYKEY, (String)consumingMap.get(ATTR_ACTIVITYKEY));
+            writer.attr(ATTR_JAR_TIME, (String)consumingMap.get(ATTR_JAR_TIME));
+            writer.attr(ATTR_CREATE_TIME, (String)consumingMap.get(ATTR_CREATE_TIME));
+            writer.attr(ATTR_UUID, (String)consumingMap.get(ATTR_UUID));
+            writer.attr(ATTR_TIME_CONSUME, (long)consumingMap.get(ATTR_TIME_CONSUME));
+            writer.attr(ATTR_VERSION, (String)consumingMap.get(ATTR_VERSION));
+            writer.attr(ATTR_USERNAME, (String)consumingMap.get(ATTR_USERNAME));
+            writer.end();
+        }
+
+        public void readXML(XMLableReader reader) {
+            if (!reader.isChildNode()) {
+                dayCount = reader.getAttrAsInt(ATTR_DAY_COUNT, 0);
+                templateID = reader.getAttrAsString(ATTR_TEMPLATE_ID, StringUtils.EMPTY);
+            } else {
+                try {
+                    String name = reader.getTagName();
+                    if (XML_PROCESS_MAP.equals(name)) {
+                        processMap.put(ATTR_PROCESS, reader.getAttrAsString(ATTR_PROCESS, StringUtils.EMPTY));
+                        processMap.put(ATTR_FLOAT_COUNT, reader.getAttrAsInt(ATTR_FLOAT_COUNT, 0));
+                        processMap.put(ATTR_WIDGET_COUNT, reader.getAttrAsInt(ATTR_WIDGET_COUNT, 0));
+                        processMap.put(ATTR_CELL_COUNT, reader.getAttrAsInt(ATTR_CELL_COUNT, 0));
+                        processMap.put(ATTR_BLOCK_COUNT, reader.getAttrAsInt(ATTR_BLOCK_COUNT, 0));
+                        processMap.put(ATTR_REPORT_TYPE, reader.getAttrAsInt(ATTR_REPORT_TYPE, 0));
+                        processMap.put(ATTR_TEMPLATE_ID, templateID);
+                    } else if(XML_CONSUMING_MAP.equals(name)){
+                        consumingMap.put(ATTR_ACTIVITYKEY, reader.getAttrAsString(ATTR_ACTIVITYKEY, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_JAR_TIME, reader.getAttrAsString(ATTR_JAR_TIME, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_CREATE_TIME, reader.getAttrAsString(ATTR_CREATE_TIME, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_TEMPLATE_ID, templateID);
+                        consumingMap.put(ATTR_UUID, reader.getAttrAsString(ATTR_UUID, StringUtils.EMPTY));
+                        consumingMap.put(ATTR_TIME_CONSUME, reader.getAttrAsLong(ATTR_TIME_CONSUME, 0));
+                        consumingMap.put(ATTR_VERSION, reader.getAttrAsString(ATTR_VERSION, "8.0"));
+                        consumingMap.put(ATTR_USERNAME, reader.getAttrAsString(ATTR_USERNAME, StringUtils.EMPTY));
+                    }
+                } catch (Exception ex) {
+                    // 什么也不做，使用默认值
+                }
+            }
+        }
+
+    }
+
+
     public static void main(String[] args) {
         TemplateInfoCollector tic = TemplateInfoCollector.getInstance();
         tic.sendTemplateInfo();

designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java

@@ -1,38 +1,34 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
+import com.fr.design.dialog.BasicPane;
-import java.awt.Color;
+import com.fr.design.layout.FRGUIPaneFactory;
-import java.awt.Dimension;
+import com.fr.general.Inter;
 
-import javax.swing.JColorChooser;
+import javax.swing.*;
-import javax.swing.JPanel;
 import javax.swing.colorchooser.AbstractColorChooserPanel;
 import javax.swing.colorchooser.ColorSelectionModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-
+import java.awt.*;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.Inter;
 
 /**
  * 颜色选择器更多颜色面板
- * @author focus
  *
+ * @author focus
  */
-public class ColorSelectDetailPane extends BasicPane{
+public class ColorSelectDetailPane extends BasicPane {
     private static final int SELECT_PANEL_HEIGHT = 245;
     // Selected color
     private Color color;
 
     // 颜色选择器面板
-	JColorChooser selectedPanel;
+    private JColorChooser selectedPanel;
 
     // 最近使用颜色面板
-	JPanel recentUsePanel;
+    private JPanel recentUsePanel;
 
     // 预览
-	JPanel previewPanel;
+    private JPanel previewPanel;
 
     public JColorChooser getSelectedPanel() {
         return selectedPanel;
@@ -50,12 +46,8 @@ public class ColorSelectDetailPane extends BasicPane{
         this.color = color;
     }
 
-	public ColorSelectDetailPane() {
+    public ColorSelectDetailPane(Color color) {
-		super();
+        if (color == null) {
-	}
-	
-	public ColorSelectDetailPane(Color color){
-		if(color == null){
             color = Color.white;
         }
         this.color = color;
@@ -72,9 +64,9 @@ public class ColorSelectDetailPane extends BasicPane{
 
         // 颜色选择器面板
         selectedPanel = new JColorChooser(this.color);
-		selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(),SELECT_PANEL_HEIGHT));
+        selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(), SELECT_PANEL_HEIGHT));
         AbstractColorChooserPanel[] choosers = selectedPanel.getChooserPanels();
-		for(int i=0;i<choosers.length;i++){
+        for (int i = 0; i < choosers.length; i++) {
             selectedPanel.removeChooserPanel(choosers[i]);
         }
         selectedPanel.setPreviewPanel(new JPanel());
@@ -90,7 +82,7 @@ public class ColorSelectDetailPane extends BasicPane{
         RecentUseColorPane recent = new RecentUseColorPane(selectedPanel);
         recentUsePanel.add(recent);
 
-		this.add(recentUsePanel,BorderLayout.CENTER);
+        this.add(recentUsePanel, BorderLayout.CENTER);
 
         selectedPanel.setPreviewPanel(new JPanel());
 

designer_base/src/com/fr/design/style/color/ColorSelectPane.java

@@ -3,26 +3,23 @@
  */
 package com.fr.design.style.color;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.general.Inter;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 
 /**
  * The pane used to select color
@@ -34,7 +31,8 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
     //color setting action.
     private ArrayList<ChangeListener> colorChangeListenerList = new ArrayList<ChangeListener>();
 
-    ColorSelectDetailPane pane;
+
+    /* default */ ColorSelectDetailPane pane;
 
     /**
      * Constructor.
@@ -104,20 +102,20 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
         return menuColorPane;
     }
 
-	// 第一行，1个取色按钮 + 7个最近使用的颜色
+    // 第一行，1个取色按钮 + 1个留空的单元格 + 6个最近使用的颜色
     protected JPanel getRow1Pane() {
         JPanel row1Pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         row1Pane.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 0));
         row1Pane.setPreferredSize(new Dimension(135, 24));  // 宽度为 16 * 8 + 7
 
         // 最近使用
-		UsedColorPane usedColorPane = new UsedColorPane(1, 8, 1, ColorSelectConfigManager.getInstance().getColors(), this, true, true);
+        UsedColorPane usedColorPane = new UsedColorPane(1, 8, 1, this, true, true);
         usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
         row1Pane.add(usedColorPane.getPane());
         return row1Pane;
     }
 
-    protected Color[] getColorArray(){
+    protected Color[] getColorArray() {
         return ColorFactory.MenuColors;
     }
 
@@ -125,7 +123,8 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
     /**
      * Add change listener.
      * 增加监听
-     * @param 监听
+     *
+     * @param changeListener
      */
     public void addChangeListener(ChangeListener changeListener) {
         this.colorChangeListenerList.add(changeListener);
@@ -166,8 +165,6 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 
     /**
      * 选中颜色
-     * @param 颜色单元格
-     * 
      */
     @Override
     public void colorSetted(ColorCell colorCell) {
@@ -176,8 +173,8 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 
     /**
      * 初始化中央面板
-	 * @param centerPane 中央面板
      *
+     * @param centerPane 中央面板
      */
     @Override
     public void initCenterPaneChildren(JPanel centerPane) {

designer_base/src/com/fr/design/style/color/NewColorSelectPane.java

@@ -1,33 +1,25 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import com.fr.design.constants.UIConstants;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.BasicPane;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+
 
 /**
- * 
  * @author zhou
  * @since 2012-5-29上午10:39:35
  */
@@ -47,7 +39,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     private final static int WINDWO_HEIGHT = 150;
 
     // 最近使用颜色
-	UsedColorPane usedColorPane;
+    private UsedColorPane usedColorPane;
 
     /**
      * Constructor.
@@ -85,7 +77,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         row1Pane.setPreferredSize(new Dimension(135, 16));  // 宽度为 16 * 8 + 7
         centerPane.add(row1Pane);
         // 最近使用
-		usedColorPane = new UsedColorPane(1, 8, 1, ColorSelectConfigManager.getInstance().getColors(), this, true, false);
+        usedColorPane = new UsedColorPane(1, 8, 1, this, true, false);
         usedColorPane.getPane().setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
         row1Pane.add(usedColorPane.getPane());
 
@@ -102,7 +94,6 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
         // mod by anchore 16/11/16
         UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color"));
-		//UIButton customButton = new UIButton(Inter.getLocText(new String[]{"More", "Color"}) + "...");
 
         customButton.addMouseListener(new MouseAdapter() {
             @Override
@@ -118,11 +109,10 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     }
 
 
-
     /**
      * 添加监听
-	 * @param 监听列表
+     *
-	 * Add change listener.
+     * @param 监听列表 Add change listener.
      */
     public void addChangeListener(ChangeListener changeListener) {
         this.colorChangeListenerList.add(changeListener);
@@ -135,6 +125,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     /**
      * 获取颜色
+     *
      * @return 颜色
      * Return the color.
      */
@@ -158,8 +149,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     /**
      * Set the color.
      *
-	 * @param color
+     * @param color the new color.
-	 *            the new color.
      */
     @Override
     public void setColor(Color color) {
@@ -179,6 +169,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     /**
      * 设置颜色
+     *
      * @param 颜色位置
      */
     @Override
@@ -189,6 +180,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     protected void doTransparent() {
         setColor(null);
     }
+
     protected void customButtonPressed() {
         pane = new ColorSelectDetailPane(Color.WHITE);
         ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
@@ -196,7 +188,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     @Override
     public Dimension getPreferredSize() {
-		if(isSupportTransparent){
+        if (isSupportTransparent) {
             return new Dimension(super.getPreferredSize().width, TRANSPANENT_WINDOW_HEIGHT);
         }
         return new Dimension(super.getPreferredSize().width, WINDWO_HEIGHT);
@@ -204,12 +196,10 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     /**
      * 更新最近使用颜色
-	 * 
      */
-	public void updateUsedColor(){
+    public void updateUsedColor() {
         usedColorPane.updateUsedColor();
     }
 
 
-
 }

designer_base/src/com/fr/design/style/color/RecentUseColorPane.java

@@ -1,25 +1,20 @@
 package com.fr.design.style.color;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-
-import javax.swing.JColorChooser;
-import javax.swing.JPanel;
-
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 
-public class RecentUseColorPane extends BasicPane implements ColorSelectable{
+import javax.swing.*;
+import java.awt.*;
 
-	JColorChooser chooser;
+public class RecentUseColorPane extends BasicPane implements ColorSelectable {
+
+    private JColorChooser chooser;
 
     @Override
     protected String title4PopupWindow() {
         return null;
     }
 
-	public RecentUseColorPane() {
-	}
 
     public RecentUseColorPane(JColorChooser chooser) {
         this.chooser = chooser;
@@ -28,14 +23,12 @@ public class RecentUseColorPane extends BasicPane implements ColorSelectable{
         JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
         this.add(centerPane, BorderLayout.CENTER);
         // 最近使用
-		UsedColorPane pane = new UsedColorPane(2, 10, ColorSelectConfigManager.getInstance().getColors(),this);
+        UsedColorPane pane = new UsedColorPane(2, 10, this);
         centerPane.add(pane.getPane());
     }
 
     /**
      * 选中颜色
-	 * 
-	 * @param 颜色
      */
     @Override
     public void colorSetted(ColorCell color) {

designer_base/src/com/fr/design/style/color/UsedColorPane.java

@@ -1,17 +1,15 @@
 package com.fr.design.style.color;
 
-import java.awt.Color;
-import java.awt.GridLayout;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.SpecialUIButton;
 
-public class UsedColorPane extends BasicPane{
+import javax.swing.*;
+import java.awt.*;
 
-	public static final Color DEFAULT_COLOR = new Color(222,222,222);
+public class UsedColorPane extends BasicPane {
+
+    // 默认显示颜色
+    public static final Color DEFAULT_COLOR = new Color(222, 222, 222);
 
     // 最近使用面板列数
     private int columns;
@@ -23,8 +21,7 @@ public class UsedColorPane extends BasicPane{
     private boolean needPickColorButton;
     // 是否在取色时实时设定颜色
     private boolean setColorRealTime;
-	// 最近使用颜色
+
-	private Object[] colors;
     // 最近使用面板
     private JPanel pane;
 
@@ -38,9 +35,6 @@ public class UsedColorPane extends BasicPane{
         this.pane = pane;
     }
 
-	public UsedColorPane(){
-		
-	}
 
     /**
      * 构造函数
@@ -52,26 +46,26 @@ public class UsedColorPane extends BasicPane{
      * @param needPickColorButton 是否需要加上取色器按钮
      * @param setColorRealTime    取色器是否实时设定颜色
      */
-	public UsedColorPane(int rows,int columns,int reserveCells, Object[] colors, ColorSelectable selectable, boolean needPickColorButton, boolean setColorRealTime){
+    public UsedColorPane(int rows, int columns, int reserveCells, ColorSelectable selectable, boolean needPickColorButton, boolean setColorRealTime) {
         this.columns = columns;
         this.rows = rows;
         this.reserveCells = reserveCells;
-		this.colors = colors;
         this.selectable = selectable;
         this.needPickColorButton = needPickColorButton;
         this.setColorRealTime = setColorRealTime;
         initialComponents();
     }
 
-	public UsedColorPane(int rows,int columns, Object[] colors,ColorSelectable selectable){
+    public UsedColorPane(int rows, int columns, ColorSelectable selectable) {
-		this(rows, columns, 0, colors, selectable, false, false);
+        this(rows, columns, 0, selectable, false, false);
     }
 
-	private void initialComponents(){
+    private void initialComponents() {
         int total = columns * rows;
         JPanel panel = new JPanel();
-		panel.setLayout(new GridLayout(rows,columns, 1, 1));
+        panel.setLayout(new GridLayout(rows, columns, 1, 1));
         panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
+        //最近使用颜色
         Color[] colors = ColorSelectConfigManager.getInstance().getColors();
         int size = colors.length;
 
@@ -90,7 +84,7 @@ public class UsedColorPane extends BasicPane{
             i++;
         }
         while (i < total) {
-			Color color = i < size ? colors[size-1-i]: DEFAULT_COLOR;
+            Color color = i < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
             panel.add(new ColorCell(color == null ? DEFAULT_COLOR : color, selectable));
             i++;
         }
@@ -99,15 +93,14 @@ public class UsedColorPane extends BasicPane{
 
     /**
      * 更新最近使用颜色
-	 * 
      */
-	public void updateUsedColor(){
+    public void updateUsedColor() {
         int total = columns * rows;
         Color[] colors = ColorSelectConfigManager.getInstance().getColors();
         int size = colors.length;
-		for(int i=this.reserveCells; i<total; i++){
+        for (int i = this.reserveCells; i < total; i++) {
             ColorCell cell = (ColorCell) this.pane.getComponent(i);
-			Color color = i < size ? colors[size-1-i]: DEFAULT_COLOR;
+            Color color = i < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
             cell.setColor(color == null ? DEFAULT_COLOR : color);
         }
     }

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

@@ -95,6 +95,8 @@ public class FormHyperlinkPane extends BasicBeanPane<FormHyperlinkProvider> {
             parameterList.toArray(parameters);
 
             formHyperlink.setParameters(parameters);
+        } else {
+            formHyperlink.setParameters(null);
         }
     }
 

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

@@ -25,6 +25,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	
 	private ChartDataPane parent;
 
+	protected AbstractTableDataContentPane getDataContentPane() {
+		return dataContentPane;
+	}
+
 	public TableDataPane(ChartDataPane parent) {
 		this.parent = parent;
 		initDataPane();
@@ -103,15 +107,18 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @param collection 图表属性的集合
 	 */
 	public void refreshContentPane(ChartCollection collection) {
+		refreshContentPane(getContentPane(collection.getSelectedChart().getPlot()));
+	}
+
+	protected void refreshContentPane(AbstractTableDataContentPane contentPane) {
 		if(dataContentPane != null) {
 			remove(dataContentPane);
 		}
-		dataContentPane = getContentPane(collection.getSelectedChart().getPlot());
+		dataContentPane = contentPane;
 		if(dataContentPane != null) {
 			add(dataContentPane, BorderLayout.CENTER);
 		}
 	}
-
 	/**
 	 * 更新界面属性
 	 */
@@ -120,17 +127,21 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			return;
 		}
 		TableDataDefinition data = (TableDataDefinition)collection.getSelectedChart().getFilterDefinition();
+		populateDSName(data);
+		if(dataContentPane != null) {
+			dataContentPane.populateBean(collection);
+		}
+	}
+	protected void populateDSName(TableDataDefinition dataDefinition){
+
 		TableData tableData = null;
-		if(data != null) {
+		if(dataDefinition != null) {
-			tableData = data.getTableData();
+			tableData = dataDefinition.getTableData();
 		}
 		onSelectTableData();
 		checkBoxUse();
 		
 		tableDataPane.populateBean(tableData);
-		if(dataContentPane != null) {
-			dataContentPane.populateBean(collection);
-		}
 	}
 
 	/**
@@ -141,6 +152,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			dataContentPane.updateBean(collection);
 		}
 		TopDefinition dataDefinition = (TopDefinition)collection.getSelectedChart().getFilterDefinition();
+		updateDSName(dataDefinition);
+	}
+
+	protected void updateDSName(TopDefinition dataDefinition) {
 		if(dataDefinition instanceof  TableDataDefinition) {
 			TableDataWrapper tableDataWrapper = tableDataPane.getTableDataWrapper();
 			if (dataDefinition != null && tableDataWrapper != null){

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

@@ -1,7 +1,5 @@
 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;
@@ -9,13 +7,14 @@ 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.form.ui.container.WAbsoluteLayout;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
+import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.FRLogger;
 
+import java.awt.*;
+
 public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 	//是不是添加到父容器上
 	private boolean isAdd2ParentLayout = false;
@@ -74,48 +73,39 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 		XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer((XCreator)comp).getTopLayout();
 		if(topLayout != null){
 			if (topLayout.isEditable()){
-				return topLayoutAccept(creator, x, y, topLayout);
+                return topLayoutAccept(creator, x, y);
 			}
 			//绝对布局嵌套，处于内层，不可编辑，不添加，topLayout只能获取到最外层可编辑的布局
 			else if (((XLayoutContainer)topLayout.getParent()).acceptType(XWAbsoluteLayout.class)) {
 				return false;
+            } else {
+                return acceptWidget(x, y);
 			}
-			else {
+        } else {
-				return acceptWidget(creator, x, y);
-			}
-		}
-		else{
 			FRLogger.getLogger().error("top layout is null!");
 		}
 
 		return false;
 	}
 
-	//toplayout假如可以编辑的话就往里面添加组件
+    //topLayout假如可以编辑的话就往里面添加组件
-	private boolean topLayoutAccept(XCreator creator, int x, int y, XLayoutContainer topLayout) {
+    private boolean topLayoutAccept(XCreator creator, int x, int y) {
-		//判断有没有和当前控件重叠
+        //允许组件重叠，可以不判断有没有和当前控件重叠
         //先计算当前控件的位置
         int creatorX, creatorY;
         if (XCreatorUtils.getParentXLayoutContainer(creator) != null) {
-
             Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator);
             creatorX = creatorRectangle.x;
             creatorY = creatorRectangle.y;
         } else {
+            //这边计算得到的组件其实位置是正确的，
+            //因为传入的x和y已经加上了宽度或者高度的一半，再减去相同的宽度和高度的一半是没区别的，
+            // 例如高度为21，那么就是+10-10;
+            // 高度为20，那么就是+10-10; 没区别
             int w = creator.getWidth() / 2;
             int h = creator.getHeight() / 2;
             creatorX = x - w;
             creatorY = y - h;
-        }
-		//再判断和布局中其他控件重叠
-		Rectangle curRec = new Rectangle(creatorX, creatorY, creator.getWidth(), creator.getHeight());
-		WAbsoluteLayout wAbsoluteLayout = (WAbsoluteLayout)topLayout.toData();
-		for (int i = 0, count = wAbsoluteLayout.getWidgetCount(); i < count; i++) {
-            BoundsWidget temp = (BoundsWidget) wAbsoluteLayout.getWidget(i);
-            Rectangle rectangle = temp.getBounds();
-            if (curRec.intersects(rectangle)){
-                return false;
-            }
         }
 		if (creatorX < 0 || creatorX + creator.getWidth() > container.getWidth()) {
             return false;
@@ -169,11 +159,10 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 	}
 
     //当前绝对布局不可编辑，就当成一个控件，组件添加在周围
-	private boolean acceptWidget(XCreator creator, int x, int y){
+    private boolean acceptWidget(int x, int y) {
         isFindRelatedComps = false;
         //拖入组件判断时，先判断是否为交叉点区域，其次三等分区域，再次平分区域
         Component comp = container.getComponentAt(x, y);
-		boolean isMatchEdge = false;
         //如果当前处于边缘地带, 那么就把他贴到父容器上
         XLayoutContainer parent = container.findNearestFit();
         container = parent != null ? parent : container;
@@ -244,7 +233,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 			if (creator.hasTitleStyle()) {
 				addParentCreator(creator);
 			} else {
-				container.add(creator, creator.toData().getWidgetName());
+                container.add(creator, creator.toData().getWidgetName(),0);
 			}
 			XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
 			layout.updateBoundsWidget(creator);
@@ -255,7 +244,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 			if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
 				addParentCreator(creator);
 			} else {
-				container.add(creator, creator.toData().getWidgetName());
+                container.add(creator, creator.toData().getWidgetName(),0);
 			}
 			XWFitLayout layout = (XWFitLayout) container;
 			// 更新对应的BoundsWidget
@@ -274,7 +263,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 
 	private void addParentCreator(XCreator child) {
 		XLayoutContainer parentPanel = child.initCreatorWrapper(child.getHeight());
-		container.add(parentPanel, child.toData().getWidgetName());
+        container.add(parentPanel, child.toData().getWidgetName(),0);
 	}
 
 	/**
@@ -325,17 +314,15 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 		int height = creator.getHeight();
 		int width = creator.getWidth();
     	if (x < 0) {
-			width += x;
+            x = container.getX();
-			x = 0;
 		} else if (x + creator.getWidth() > container.getWidth()) {
-			width = container.getWidth() - x;
+            x = container.getWidth() - width;
 		}
 
 		if (y < 0) {
-			height += y;
+            y = container.getY();
-			y = 0;
 		} else if (y + creator.getHeight() > container.getHeight()) {
-			height = container.getHeight() - y;
+            y = container.getHeight() - height;
 		}
 
 		creator.setBounds(x, y, width, height);

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

@@ -3,12 +3,6 @@
  */
 package com.fr.design.designer.beans.adapters.layout;
 
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.beans.HoverPainter;
@@ -22,14 +16,16 @@ import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.FRFitLayoutConstraints;
 import com.fr.design.designer.properties.FRFitLayoutPropertiesGroupModel;
-import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.mainframe.JForm;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.LayoutBorderStyle;
+import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 自适应布局的容器适配器
@@ -52,6 +48,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
     public void setEdit(boolean edit) {
         isEdit = edit;
     }
+
     /**
      * 构造函数
      *
@@ -134,7 +131,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
         isFindRelatedComps = false;
         //拖入组件判断时，先判断是否为交叉点区域，其次三等分区域，再次平分区域
         Component comp = container.getComponentAt(x, y);
-        if (checkInterval(comp)) {
+        if (comp == null || checkInterval(comp)) {
             return false;
         }
         //如果当前处于边缘地带, 那么就把他贴到父容器上
@@ -269,25 +266,14 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
         return super.isCrossPointArea(currentComp, x, y);
     }
 
-    protected void initCompsList() {
-        super.initCompsList();
-    }
-
-    protected void clearCompsList() {
-        super.clearCompsList();
-    }
 
-    protected Rectangle getLayoutBound(XWCardMainBorderLayout mainLayout){
+    protected Rectangle getLayoutBound(XWCardMainBorderLayout mainLayout) {
         return mainLayout.getBounds();
     }
 
     private Rectangle adjustBackupBound(Rectangle backupBound, XWCardMainBorderLayout mainLayout) {
-        // 参数界面高度对纵坐标产生的影响
+        // zhouping: REPORT-2334 表单tab布局中图表放大缩小会明显
-        JForm jform = (JForm) (HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+        // 这边不需要单独处理参数面板高度了，下面的方法中获取的是XWCardMainBorderLayout相对坐标
-        if (jform.getFormDesign().getParaComponent() != null) {
-            backupBound.y -= jform.getFormDesign().getParaHeight();
-        }
-
         Rectangle rec = getLayoutBound(mainLayout);
         // XWTabLayout里面的横纵坐标收到外层XWCardMainBorderLayout的横纵坐标影响
         // 减掉之后可以按照它原来的逻辑执行
@@ -359,7 +345,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
      * @param difference  偏移量
      */
     public void calculateBounds(Rectangle backupBound, Rectangle bounds, XCreator xCreator, int row, int difference) {
-        Rectangle rc = new Rectangle(0,0,0,0);
+        Rectangle rc = new Rectangle(0, 0, 0, 0);
         XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(xCreator);
         if (parent != null) {
             Rectangle rec = ComponentUtils.getRelativeBounds(parent);
@@ -370,17 +356,17 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
         //处理左右延伸
         switch (row) {
             case 0:
-                if (backupBound.width + backupBound.x == container.getWidth() - margin.getRight() +rc.x) {
+                if (backupBound.width + backupBound.x == container.getWidth() - margin.getRight() + rc.x) {
                     x += difference;
                 }
                 break;
             case 1:
-                if(backupBound.y + backupBound.height == container.getHeight() - margin.getBottom() +rc.y){
+                if (backupBound.y + backupBound.height == container.getHeight() - margin.getBottom() + rc.y) {
                     y += difference;
                 }
                 break;
         }
-        bounds.setLocation(x,y);
+        bounds.setLocation(x, y);
         xCreator.setBackupBound(backupBound);
         xCreator.setBounds(bounds);
         this.fix(xCreator);
@@ -424,7 +410,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
 
     // 根据需要依附的位置调整拖拽的坐标值
     private int adjustCoordinateByDependingLine(int coordinate, int[] coordinates) {
-        if(!isEdit) {
+        if (!isEdit) {
             for (int i = 0; i < coordinates.length; i++) {
                 if (coordinate == coordinates[i]) {
                     continue;
@@ -440,7 +426,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
 
     // 根据需要依附的位置调整拖拽的距离
     private int adjustDiffByDependingLine(int coordinate, int[] coordinates, int diff) {
-        if(!isEdit) {
+        if (!isEdit) {
             for (int i = 0; i < coordinates.length; i++) {
                 if (coordinate + diff > coordinates[i] - DEPENDING_SCOPE && coordinate + diff < coordinates[i] + DEPENDING_SCOPE) {
                     diff = coordinates[i] - coordinate;
@@ -558,8 +544,8 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
             difference = Math.max(difference, minWidth - getMinWidth(leftComps));
         }
         //重新计算左右两侧组件size、point
-        if (CalculateLefttRelatComponent(difference)) {
+        if (calculateLefttRelatComponent(difference)) {
-            CalculateRightRelatComponent(objx + difference, -difference);
+            calculateRightRelatComponent(objx + difference, -difference);
         }
     }
 
@@ -674,10 +660,9 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
             difference = Math.max(difference, minHeight - getMinHeight(upComps));
         }
         //重新计算上下两侧组件size、point
-        if (CalculateUpRelatComponent(difference)) {
+        if (calculateUpRelatComponent(difference)) {
-            CalculateDownRelatComponent(objY + difference, -difference);
+            calculateDownRelatComponent(objY + difference, -difference);
         }
-        ;
     }
 
     /**
@@ -757,13 +742,13 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
             int height = creatorHeight;
             calculateRelatedComponent(x, y, width, height);
             if (!rightComps.isEmpty() && getAllHeight(rightComps) == height) {
-                CalculateRightRelatComponent(x, width + actualVal);
+                calculateRightRelatComponent(x, width + actualVal);
             } else if (!leftComps.isEmpty() && getAllHeight(leftComps) == height) {
-                CalculateLefttRelatComponent(width + actualVal);
+                calculateLefttRelatComponent(width + actualVal);
             } else if (!downComps.isEmpty() && getAllWidth(downComps) == width) {
-                CalculateDownRelatComponent(y, height + actualVal);
+                calculateDownRelatComponent(y, height + actualVal);
             } else if (!upComps.isEmpty() && getAllWidth(upComps) == width) {
-                CalculateUpRelatComponent(height + actualVal);
+                calculateUpRelatComponent(height + actualVal);
             } else {
                 // 由于布局三等分的存在，可能会出现删除组件时，找不到关联的组件填充，此时特殊处理
                 calculateNoRelatedComponent(x, y, width, height);
@@ -1026,7 +1011,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
                 setAdjustedSize(tabLayout, offset, isHor);
                 for (int m = 0; m < tabLayout.getComponentCount(); m++) {
                     XCreator childCreator = tabLayout.getXCreator(m);
-                    BoundsWidget wgt = (BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData());
+                    WAbsoluteLayout.BoundsWidget wgt = (WAbsoluteLayout.BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData());
                     wgt.setBounds(tabLayout.getComponent(m).getBounds());
                 }
                 adjustCreatorsSize(percent, tabLayout, isHor);
@@ -1069,7 +1054,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
      * @param objX     调整后的坐标x
      * @param objWidth 调整后的宽度
      */
-    protected void CalculateRightRelatComponent(int objX, int objWidth) {
+    protected void calculateRightRelatComponent(int objX, int objWidth) {
         int count = rightComps.size();
         for (int i = 0; i < count; i++) {
             XCreator creator = (XCreator) rightComps.get(i);
@@ -1109,7 +1094,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
     /**
      * 删除或拉伸控件左边框时 调整左侧的组件位置大小；
      */
-    protected boolean CalculateLefttRelatComponent(int objWidth) {
+    protected boolean calculateLefttRelatComponent(int objWidth) {
         if (isBeyondAdjustWidthScope(objWidth)) {
             return false;
         }
@@ -1127,7 +1112,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
     /**
      * 删除或拉伸下边框  调整下方的组件位置大小
      */
-    protected void CalculateDownRelatComponent(int objY, int objHeight) {
+    protected void calculateDownRelatComponent(int objY, int objHeight) {
         int count = downComps.size();
         for (int i = 0; i < count; i++) {
             XCreator creator = (XCreator) downComps.get(i);
@@ -1167,7 +1152,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
     /**
      * 删除或拉伸上边框    调整上方的组件位置大小
      */
-    protected boolean CalculateUpRelatComponent(int objHeight) {
+    protected boolean calculateUpRelatComponent(int objHeight) {
         if (isBeyondAdjustHeightScope(objHeight)) {
             return false;
         }

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

@@ -27,27 +27,25 @@ public abstract class AccessDirection implements Direction {
 
 	abstract int getCursor();
 
-	protected abstract Rectangle getDraggedBounds(int dx, int dy, Rectangle current_bounds, FormDesigner designer,
+    protected abstract Rectangle getDraggedBounds(int dx, int dy, Rectangle currentBounds, FormDesigner designer,
-			Rectangle oldbounds);
+                                                  Rectangle oldBounds);
 
-	protected int[] sorption(int x, int y,Rectangle current_bounds, FormDesigner designer) {
+    protected int[] sorption(int x, int y, Rectangle currentBounds, FormDesigner designer) {
         // 自适应布局不需要吸附线，但需要对齐线，对齐线后面处理
         if (!designer.hasWAbsoluteLayout()) {
             designer.getStateModel().setEquidistantLine(null);
             designer.getStateModel().setXAbsorptionline(null);
             designer.getStateModel().setYAbsorptionline(null);
-			return new int[] { x, y };
+            return new int[]{x, y};
         } else {
-			int posy = current_bounds.y;
+            Point relativePoint = getRelativePoint(x, y, currentBounds, designer);
-
+            sorptionPoint(relativePoint, currentBounds, designer);
-			Point relativePoint = getRelativePoint(x, y, current_bounds,designer);
+            return new int[]{relativePoint.x, relativePoint.y};
-			sorptionPoint(relativePoint,current_bounds, designer);
-			return new int[] { relativePoint.x, relativePoint.y };
         }
 
     }
 
-	protected Point getRelativePoint(int x, int y, Rectangle current_bounds,FormDesigner designer) {
+    protected Point getRelativePoint(int x, int y, Rectangle currentBounds, FormDesigner designer) {
         if (x < 0) {
             x = 0;
         } else if (x > designer.getRootComponent().getWidth() && designer.getSelectionModel().hasSelectionComponent()) {
@@ -63,12 +61,11 @@ public abstract class AccessDirection implements Direction {
 		return new Point(x, y);
 	}
 
-	protected void sorptionPoint(Point point, Rectangle current_bounds,FormDesigner designer) {
+    protected void sorptionPoint(Point point, Rectangle currentBounds, FormDesigner designer) {
-		boolean findInX = current_bounds.getWidth() <= MoveUtils.SORPTION_UNIT ? true : false;
+        boolean findInX = currentBounds.getWidth() <= MoveUtils.SORPTION_UNIT;
-		boolean findInY = current_bounds.getHeight() <= MoveUtils.SORPTION_UNIT ? true : false;
+        boolean findInY = currentBounds.getHeight() <= MoveUtils.SORPTION_UNIT;
-		WAbsoluteLayout layout =getLayout(designer);
+        WAbsoluteLayout layout = getLayout(designer);
         FormSelection selection = designer.getSelectionModel().getSelection();
-		boolean isWidgetsIntersect = false;
         for (int i = 0, count = layout.getWidgetCount(); i < count; i++) {
             BoundsWidget temp = (BoundsWidget) layout.getWidget(i);
             if (!temp.isVisible() || selection.contains(temp.getWidget())) {
@@ -104,21 +101,18 @@ public abstract class AccessDirection implements Direction {
 				break;
 			}
 
-			if (current_bounds.intersects(bounds) && !(layout instanceof WParameterLayout)){
-				isWidgetsIntersect = true;
-			}
         }
-		processRectangleIntersects(designer, point.x, point.y, isWidgetsIntersect);
+        setDesignerStateModelProperties(designer, findInX, findInY, currentBounds, point);
-		setDesignerStateModelProperties(designer, findInX, findInY, current_bounds, point);
     }
 
-	private void setDesignerStateModelProperties (FormDesigner designer, boolean findInX, boolean findInY, Rectangle current_bounds, Point point) {
+    private void setDesignerStateModelProperties(FormDesigner designer, boolean findInX, boolean findInY, Rectangle
-		designer.getStateModel().setXAbsorptionline(findInX && current_bounds.getWidth() > MoveUtils.SORPTION_UNIT ? Absorptionline.createXAbsorptionline(point.x) : null);
+            currentBounds, Point point) {
-		designer.getStateModel().setYAbsorptionline(findInY && current_bounds.getHeight() > MoveUtils.SORPTION_UNIT ? Absorptionline.createYAbsorptionline(point.y) : null);
+        designer.getStateModel().setXAbsorptionline(findInX && currentBounds.getWidth() > MoveUtils.SORPTION_UNIT ? Absorptionline.createXAbsorptionline(point.x) : null);
+        designer.getStateModel().setYAbsorptionline(findInY && currentBounds.getHeight() > MoveUtils.SORPTION_UNIT ? Absorptionline.createYAbsorptionline(point.y) : null);
         designer.getStateModel().setEquidistantLine(null);
     }
 
-	private Rectangle getWidgetRelativeBounds(Rectangle bounds, FormSelection selection){
+    private Rectangle getWidgetRelativeBounds(Rectangle bounds, FormSelection selection) {
         Rectangle relativeRec = new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
         XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(selection.getSelectedCreator());
         if (parent == null) {
@@ -130,32 +124,19 @@ public abstract class AccessDirection implements Direction {
         return relativeRec;
     }
 
-	private void processRectangleIntersects(FormDesigner designer, int x, int y, boolean isIntersects){
-		if(isIntersects){
-			if(designer.getLocationOnScreen() != null) {
-				MoveUtils.displayForbidWindow(x + designer.getLocationOnScreen().x, y + designer.getLocationOnScreen().y);
-			}
-			designer.setWidgetsIntersect(true);
-		}
-		else{
-			MoveUtils.hideForbidWindow();
-			designer.setWidgetsIntersect(false);
-		}
-	}
 
     private WAbsoluteLayout getLayout(final FormDesigner designer){
         XLayoutContainer formLayoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(
                 designer.getTarget().getContainer());
         WAbsoluteLayout layout;
-        if (formLayoutContainer.acceptType(XWBorderLayout.class)){//看起来这边的作用应该是为了区别cpt(得到XWParameterLayout)还是frm(得到XWBorderLayout)的参数界面
+        if (formLayoutContainer.acceptType(XWBorderLayout.class)) {//看起来这边的作用应该是为了区别cpt(得到XWParameterLayout)还是frm(得到XWBorderLayout)的参数界面
             Container container = designer.getSelectionModel().getSelection().getSelectedCreator().getParent();
-			if(container instanceof XWAbsoluteLayout){
+            if (container instanceof XWAbsoluteLayout) {
-				layout = ((XWAbsoluteLayout)container).toData();
+                layout = ((XWAbsoluteLayout) container).toData();
-			}
+            } else {
-			else {
                 layout = (WAbsoluteLayout) designer.getParaComponent().toData();
             }
-        } else{
+        } else {
             layout = (WAbsoluteLayout) designer.getTarget().getContainer();
         }
         return layout;
@@ -163,12 +144,18 @@ public abstract class AccessDirection implements Direction {
 
     /**
      * 拖拽
+     *
      * @param dx       坐标x
      * @param dy       坐标y
      * @param designer 设计界面
      */
     public void drag(int dx, int dy, FormDesigner designer) {
         Rectangle rec = getDraggedBounds(dx, dy, designer.getSelectionModel().getSelection().getRelativeBounds(), designer, designer.getSelectionModel().getSelection().getBackupBounds());
+        if (rec != null) {
+            designer.getSelectionModel().getSelection().setSelectionBounds(rec, designer);
+        } else {
+            return;
+        }
         //设定控件最小高度21，因每次拖曳至少移动1，防止控件高度等于21时，拖曳导致rec.y的变化使得控件不停的向上或向下移动。
         if(rec.height == MINHEIGHT){
             ymin = rec.y;
@@ -191,9 +178,7 @@ public abstract class AccessDirection implements Direction {
         	rec.width = MINWIDTH;
         	rec.x = xmin;
         }
-		if(rec != null) {
+
-			designer.getSelectionModel().getSelection().setSelectionBounds(rec, designer);
-		}
     }
 
 	/**

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

@@ -136,19 +136,35 @@ public class SelectionModel {
         if (designer.getClass().equals(FormDesigner.class)) {
             if (selection.getSelectedCreator() instanceof XWFitLayout) {
                 if (selection.getSelectedCreator().getClass().equals(XWTabFitLayout.class)) {
-                    Rectangle rec = selection.getRelativeBounds();
+                    XLayoutContainer container = (XLayoutContainer) selection.getSelectedCreator();
-                    //Tab布局
+                    //tab布局编辑器内部左上角第一个坐标点
-                    FormSelectionUtils.paste2Container(designer, (XLayoutContainer) selection.getSelectedCreator(),
+                    int leftUpX = container.toData().getMargin().getLeft() + 1;
-                            clipboard,
+                    int leftUpY = container.toData().getMargin().getTop() + 1;
-                            rec.x + rec.width / 2,
+                    //选中第一个坐标点坐在的组件
-                            rec.y + DELTA_X_Y);
+                    selection.setSelectedCreator((XCreator) container.getComponentAt(leftUpX, leftUpY));
+                    Rectangle rectangle = selection.getRelativeBounds();
+                    if (hasSelectedPasteSource()) {
+                        selectedPaste();
+                    } else {
+                        FormSelectionUtils.paste2Container(designer, container, clipboard,
+                                rectangle.x + rectangle.width / 2,
+                                rectangle.y + DELTA_X_Y);
+                    }
+                } else {
+                    //自适应布局编辑器内部左上角第一个坐标点
+                    int leftUpX = designer.getRootComponent().toData().getMargin().getLeft() + 1;
+                    int leftUpY = designer.getRootComponent().toData().getMargin().getTop() + 1;
+                    //选中第一个坐标点坐在的组件
+                    selection.setSelectedCreator((XCreator) designer.getRootComponent().getComponentAt(leftUpX, leftUpY));
+                    Rectangle rectangle = selection.getRelativeBounds();
+                    if (hasSelectedPasteSource()) {
+                        selectedPaste();
                     } else {
-                    Rectangle rec = selection.getRelativeBounds();
-                    //自适应布局
                         FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
                                 clipboard,
-                            rec.x + rec.width / 2,
+                                rectangle.x + rectangle.width / 2,
-                            rec.y + DELTA_X_Y);
+                                rectangle.y + DELTA_X_Y);
+                    }
                 }
             } else {
                 //绝对布局
@@ -178,12 +194,23 @@ public class SelectionModel {
         container = XCreatorUtils.getParentXLayoutContainer(selection.getSelectedCreator());
         if (container != null && selection.getSelectedCreator().getParent() instanceof XWFitLayout) {
             //自适应布局
+
             Rectangle selectionRec = selection.getRelativeBounds();
+            //获取父容器位置，补充因参数面板高度导致的位置坐标计算偏移
             Rectangle containerRec = ComponentUtils.getRelativeBounds(container);
+            int positionX, positionY;
+
+            if (container.getClass().equals(XWTabFitLayout.class)) {
+                //tab内部粘贴不补充高度偏移
+                //且不计算参数面板造成的影响，因为在
+                //@see com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter#addBean中做了
+                positionX = selectionRec.x + selectionRec.width / 2;
+                positionY = (int) (selectionRec.y + selectionRec.height * OFFSET_RELATIVE);
+            } else {
                 //计算自适应布局位置
-            int positionX = selectionRec.x - containerRec.x + selectionRec.width / 2;
+                positionX = selectionRec.x - containerRec.x + selectionRec.width / 2;
-            int positionY = (int) (selectionRec.y - containerRec.y + selectionRec.height * OFFSET_RELATIVE);
+                positionY = (int) (selectionRec.y - containerRec.y + selectionRec.height * OFFSET_RELATIVE);
-
+            }
             FormSelectionUtils.paste2Container(designer, container, clipboard, positionX, positionY);
         } else if (container != null && selection.getSelectedCreator().getParent() instanceof XWAbsoluteLayout) {
             //绝对布局

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

@@ -10,9 +10,11 @@ import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.fun.impl.AbstractFormElementCaseEditorProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
+import com.fr.design.mainframe.widget.editors.BooleanEditor;
 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.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.FormProvider;
@@ -86,7 +88,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 
 					@Override
 					public void propertyChange() {
-						makeVisible(toData().isVisible());}
+						makeVisible(toData().isVisible());
+					}
 				}),
 				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
 						WLayoutBorderStyleEditor.class).setI18NName(
@@ -97,12 +100,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 					public void propertyChange() {
 						initStyle();
 					}
-							
 				}),
 				new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
 						.setI18NName(Inter.getLocText("FR-Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-				new CRPropertyDescriptor("ToolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
+				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};

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

@@ -3,14 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-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.ArrayList;
-import java.util.HashMap;
-
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.LayoutAdapter;
@@ -20,16 +12,26 @@ 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.icon.IconPathConstants;
-import com.fr.design.mainframe.*;
+import com.fr.design.mainframe.EditingMouseListener;
+import com.fr.design.mainframe.FormArea;
+import com.fr.design.mainframe.FormDesigner;
 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.WLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import com.fr.form.ui.container.WLayout;
 import com.fr.general.FRScreen;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
+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.ArrayList;
+import java.util.HashMap;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -44,19 +46,19 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     //由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
     protected double containerPercent = 1.0;
 
-	private HashMap<Connector,XConnector> xConnectorMap;
+    private HashMap<Connector, XConnector> xConnectorMap;
 
     public XWAbsoluteLayout() {
-		this(new WAbsoluteLayout(),new Dimension());
+        this(new WAbsoluteLayout(), new Dimension());
     }
 
     public XWAbsoluteLayout(WAbsoluteLayout widget) {
-		this(widget,new Dimension());
+        this(widget, new Dimension());
     }
 
     public XWAbsoluteLayout(WAbsoluteLayout widget, Dimension initSize) {
         super(widget, initSize);
-		this.xConnectorMap =  new HashMap<Connector,XConnector>();
+        this.xConnectorMap = new HashMap<Connector, XConnector>();
         Connector connector;
         for (int i = 0; i < widget.connectorCount(); i++) {
             connector = widget.getConnectorIndex(i);
@@ -77,17 +79,18 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     }
 
     //根据屏幕大小来确定显示的百分比, 1440*900默认100%, 1366*768缩放90%
-	private void initPercent(WAbsoluteLayout widget){
+    private void initPercent(WAbsoluteLayout widget) {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         Dimension scrnsize = toolkit.getScreenSize();
         double screenValue = FRScreen.getByDimension(scrnsize).getValue();
-		if(screenValue != FormArea.DEFAULT_SLIDER){
+        if (screenValue != FormArea.DEFAULT_SLIDER) {
             this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER);
         }
     }
 
     /**
      * 返回容器大小的百分比
+     *
      * @return the containerPercent
      */
     public double getContainerPercent() {
@@ -96,16 +99,18 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 设置容器大小的百分比
+     *
      * @param containerPercent the containerPercent to set
      */
     public void setContainerPercent(double containerPercent) {
         this.containerPercent = containerPercent;
-		minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH*containerPercent);
+        minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH * containerPercent);
-		minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT*containerPercent);
+        minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT * containerPercent);
     }
 
     /**
      * 返回界面处根据百分比调整后的最小宽度
+     *
      * @return 最小宽度
      */
     public int getActualMinWidth() {
@@ -114,6 +119,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 返回界面处根据百分比调整后的最小高度
+     *
      * @return 最小高度
      */
     public int getActualMinHeight() {
@@ -122,13 +128,14 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 返回界面处根据百分比调整后的间隔大小（且为偶数）
+     *
      * @return 间隔
      */
     public int getAcualInterval() {
         // adapter那边交叉三等分、删除都要判断是否对齐，所以间隔转为偶数
-		int interval = (int) (toData().getCompInterval()*containerPercent);
+        int interval = (int) (toData().getCompInterval() * containerPercent);
-		int val = interval/2;
+        int val = interval / 2;
-		return val*2;
+        return val * 2;
     }
 
     /**
@@ -138,10 +145,10 @@ public class XWAbsoluteLayout extends XLayoutContainer {
         if (containerPercent == 1.0) {
             return rec;
         }
-		rec.x = (int) (rec.x/containerPercent);
+        rec.x = (int) (rec.x / containerPercent);
-		rec.y = (int) (rec.y/containerPercent);
+        rec.y = (int) (rec.y / containerPercent);
-		rec.width = (int) (rec.width/containerPercent);
+        rec.width = (int) (rec.width / containerPercent);
-		rec.height = (int) (rec.height/containerPercent);
+        rec.height = (int) (rec.height / containerPercent);
         return rec;
     }
 
@@ -151,28 +158,29 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     public void updateBoundsWidget(XCreator xCreator) {
         WAbsoluteLayout layout = this.toData();
         if (xCreator.hasTitleStyle()) {
-			xCreator = (XLayoutContainer)xCreator.getParent();
+            xCreator = (XLayoutContainer) xCreator.getParent();
         }
-		if (xCreator.acceptType(XWAbsoluteLayout.class)){
+        if (xCreator.acceptType(XWAbsoluteLayout.class)) {
             ((XWAbsoluteLayout) xCreator).updateBoundsWidget();
         }
         // 如果子组件时tab布局，则tab布局内部的组件的wiget也要更新，否则保存后重新打开大小不对
         ArrayList<?> childrenList = xCreator.getTargetChildrenList();
-		if(!childrenList.isEmpty()){
+        if (!childrenList.isEmpty()) {
-			for(int i=0; i<childrenList.size(); i++){
+            for (int i = 0; i < childrenList.size(); i++) {
                 XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(i);
                 tabLayout.updateBoundsWidget();
             }
         }
-        BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData());		Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
+        BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData());
+        Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
     }
 
-	private Rectangle calculateBound(Rectangle rec, double pw, double ph){
+    private Rectangle calculateBound(Rectangle rec, double pw, double ph) {
-		Rectangle calRec = new Rectangle(0,0,0,0);
+        Rectangle calRec = new Rectangle(0, 0, 0, 0);
-		calRec.x = (int)(rec.x / pw);
+        calRec.x = (int) (rec.x / pw);
-		calRec.y = (int)(rec.y / ph);
+        calRec.y = (int) (rec.y / ph);
-		calRec.width = (int)(rec.width / pw);
+        calRec.width = (int) (rec.width / pw);
-		calRec.height = (int)(rec.height / ph);
+        calRec.height = (int) (rec.height / ph);
         return calRec;
     }
 
@@ -186,7 +194,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
         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++){
+            for (int index = 0, n = this.getComponentCount(); index < n; index++) {
                 XCreator creator = (XCreator) this.getComponent(index);
                 BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
                 // 用当前的显示大小计算后调正具体位置
@@ -195,7 +203,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
                 wgt.setBounds(rec);
                 creator.setBounds(rec);
                 //绝对布局嵌套，要更新内部的绝对布局
-				if (creator.acceptType(XWAbsoluteLayout.class)){
+                if (creator.acceptType(XWAbsoluteLayout.class)) {
                     creator.setBackupBound(wgtBound);
                     ((XWAbsoluteLayout) creator).updateBoundsWidget();
                 }
@@ -207,6 +215,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
      * 更新子组件的Bound
      * 这边主要用于绝对布局子组件在适应区域选项时
      * 涉及到的不同分辨率下缩放
+     *
      * @param minHeight 最小高度
      */
     @Override
@@ -216,10 +225,10 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             for (int i = 0; i < this.getComponentCount(); i++) {
                 XCreator creator = getXCreator(i);
                 Rectangle rec = new Rectangle(creator.getBounds());
-				rec.x = (int)(rec.x / prevContainerPercent * containerPercent);
+                rec.x = (int) (rec.x / prevContainerPercent * containerPercent);
-				rec.y = (int)(rec.y / prevContainerPercent * containerPercent);
+                rec.y = (int) (rec.y / prevContainerPercent * containerPercent);
-				rec.height = (int)(rec.height / prevContainerPercent * containerPercent);
+                rec.height = (int) (rec.height / prevContainerPercent * containerPercent);
-				rec.width = (int)(rec.width / prevContainerPercent * containerPercent);
+                rec.width = (int) (rec.width / prevContainerPercent * containerPercent);
                 BoundsWidget wgt = (BoundsWidget) toData().getBoundsWidget(creator.toData());
                 wgt.setBounds(rec);
                 creator.setBounds(rec);
@@ -231,6 +240,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 增加对齐线
+     *
      * @param connector 对齐线
      */
     public void addConnector(Connector connector) {
@@ -244,6 +254,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 去除对齐线
+     *
      * @param connector 对齐线
      */
     public void removeConnector(Connector connector) {
@@ -253,6 +264,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 返回对应的widget容器
+     *
      * @return 返回WAbsoluteLayout
      */
     @Override
@@ -267,6 +279,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 返回默认的容器name
+     *
      * @return 返回绝对布局容器名
      */
     @Override
@@ -308,10 +321,10 @@ public class XWAbsoluteLayout extends XLayoutContainer {
         WAbsoluteLayout abs = toData();
         this.removeAll();
         for (int i = 0, count = abs.getWidgetCount(); i < count; i++) {
-			BoundsWidget bw = (BoundsWidget)abs.getWidget(i);
+            BoundsWidget bw = (BoundsWidget) abs.getWidget(i);
             if (bw != null) {
                 Rectangle bounds = bw.getBounds();
-				XWidgetCreator comp = (XWidgetCreator)XCreatorUtils.createXCreator(bw.getWidget());
+                XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(bw.getWidget());
                 if (!comp.acceptType(XWParameterLayout.class)) {
                     comp.setDirections(Direction.ALL);
                 }
@@ -324,6 +337,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 当前组件zorder位置替换新的控件
+     *
      * @param widget     控件
      * @param oldcreator 旧组件
      * @return 组件
@@ -342,6 +356,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 组件增加
+     *
      * @param e 容器事件
      */
     @Override
@@ -359,6 +374,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     /**
      * 在设计界面中有组件移除的时候，需要通知WLayout容器重新paint
+     *
      * @param e 容器事件
      */
     @Override
@@ -386,21 +402,21 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     @Override
     public XLayoutContainer getTopLayout() {
         XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
-		if (xTopLayout != null && !xTopLayout.isEditable()){
+        if (xTopLayout != null && !xTopLayout.isEditable()) {
             return xTopLayout;
-		}
+        } else {
-		else{
             return this;
         }
     }
 
     /**
      * 得到属性名
+     *
      * @return 属性名
      * @throws java.beans.IntrospectionException
      */
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		return  new CRPropertyDescriptor[] {
+        return new CRPropertyDescriptor[]{
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(
                         Inter.getLocText("FR-Designer_Form-Widget_Name"))
         };
@@ -448,7 +464,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
      * @param editingMouseListener 鼠标点击，位置处理器
      * @param e                    鼠标点击事件
      */
-	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+    public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) {
         FormDesigner designer = editingMouseListener.getDesigner();
         SelectionModel selectionModel = editingMouseListener.getSelectionModel();
         boolean isEditing = isEditable() || designer.getCursor().getType() == Cursor.HAND_CURSOR || e.getClickCount() == 2;
@@ -468,6 +484,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     /**
      * body大小手动调整的时候
      * 按照比例调整组件的宽度
+     *
      * @param percent 比例
      */
     @Override
@@ -484,6 +501,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     /**
      * body大小手动调整的时候
      * 按照比例调整组件的高度
+     *
      * @param percent 比例
      */
     @Override

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

@@ -14,7 +14,7 @@ public class TabMoveEndAction extends TabMoveAction {
     public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_End"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/rightright.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/end.png"));
     }
 
     //改变Tab的索引号

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

@@ -14,7 +14,7 @@ public class TabMoveFirstAction extends TabMoveAction {
     public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_First"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/leftleft.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/first.png"));
     }
 
     @Override

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

@@ -14,7 +14,7 @@ public class TabMoveNextAction extends TabMoveAction {
     public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_Next"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/right.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png"));
     }
 
     @Override

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

@@ -14,7 +14,7 @@ public class TabMovePrevAction extends TabMoveAction {
     public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
         super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_Prev"));
-        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/left.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/prev.png"));
     }
 
     @Override

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

@@ -3,10 +3,6 @@
  */
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
@@ -17,12 +13,18 @@ import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.IOUtils;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.Inter;
 
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+
 /**
  * card布局主体框架
  * 

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

@@ -1,21 +1,14 @@
 package com.fr.design.mainframe;
 
 import java.awt.Component;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
 import javax.swing.DropMode;
-import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.designer.beans.AdapterBus;
-import com.fr.design.designer.beans.ComponentAdapter;
-import com.fr.design.designer.beans.events.DesignerEditListener;
-import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.treeview.ComponentTreeCellRenderer;
 import com.fr.design.designer.treeview.ComponentTreeModel;
@@ -92,9 +85,9 @@ public class ComponentTree extends JTree {
         }
     }
 
-    public void setAndScrollSelectionPath(TreePath treepath) {
+    public void setAndScrollSelectionPath(TreePath[] treepath) {
-        setSelectionPath(treepath);
+        setSelectionPaths(treepath);
-        scrollPathToVisible(treepath);
+        scrollPathToVisible(treepath[0]);
     }
 
 
@@ -112,7 +105,6 @@ public class ComponentTree extends JTree {
     public TreePath[] getSelectedTreePath() {
         XCreator[] creators = designer.getSelectionModel().getSelection().getSelectedCreators();
         TreePath[] paths = new TreePath[creators.length];
-
         for (int i = 0; i < paths.length; i++) {
             paths[i] = buildTreePath(creators[i]);
         }
@@ -141,7 +133,7 @@ public class ComponentTree extends JTree {
             paths[i] = buildTreePath(searchList.get(i));
         }
         if(paths.length > 0) {
-            setAndScrollSelectionPath(paths[0]);
+            setAndScrollSelectionPath(paths);
         } else {
             setSelectionPath();
         }
@@ -217,4 +209,5 @@ public class ComponentTree extends JTree {
         Object[] components = path.toArray();
         return new TreePath(components);
     }
+
 }

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

@@ -1018,7 +1018,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             }
 
             if (!BaseUtils.isAuthorityEditing()) {
-
                 selectionModel.setSelectedCreators(selected);
 
                 TreePath path = e.getNewLeadSelectionPath();

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

@@ -3,8 +3,10 @@ package com.fr.design.mainframe;
 import com.fr.base.FRContext;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.AbstractLayoutAdapter;
+import com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
+import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.general.ComparatorUtils;
@@ -83,15 +85,27 @@ public class FormSelectionUtils {
      * 相对布局粘贴
      */
     private static void relativePaste(FormDesigner designer, FormSelection clipboard, LayoutAdapter adapter, int x, int y) {
+
+        //@see FRTabFitLayoutAdapter
+        Rectangle tabContainerRect = ComponentUtils.getRelativeBounds(designer.getSelectionModel().getSelection()
+                .getSelectedCreator().getParent());
+
         designer.getSelectionModel().getSelection().reset();
         for (XCreator creator : clipboard.getSelectedCreators()) {
             try {
                 Widget copied = copyWidget(designer, creator);
                 XCreator copiedCreator = XCreatorUtils.createXCreator(copied, creator.getSize());
+                if (adapter.getClass().equals(FRTabFitLayoutAdapter.class)) {
+                    if (!adapter.accept(copiedCreator, x - tabContainerRect.x, y - tabContainerRect.y)) {
+                        designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Small_To_Paste"));
+                        return;
+                    }
+                } else {
                     if (!adapter.accept(copiedCreator, x, y)) {
                         designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Small_To_Paste"));
                         return;
                     }
+                }
                 boolean addSuccess = adapter.addBean(copiedCreator, x, y);
                 if (addSuccess) {
                     designer.getSelectionModel().getSelection().addSelectedCreator(copiedCreator);
@@ -118,29 +132,20 @@ public class FormSelectionUtils {
             XLayoutContainer container = layoutAdapter.getContainer();
             boolean xOut = x < 0 || x + copiedCreator.getWidth() / 2 + xoffset > container.getWidth();
             boolean yOut = y < 0 || y + copiedCreator.getHeight() / 2 + yoffset > container.getHeight();
-            /*
+
-             * 组件原始位置位于布局的右下角，
+            boolean isEdge = (x - DELAY_X_Y == container.getWidth() - copiedCreator.getWidth() / 2 - xoffset)
-             * 和布局右下边界线紧挨，
+                    && (y - DELAY_X_Y == container.getHeight() - copiedCreator.getHeight() / 2 - yoffset);
-             * 粘贴时组件在原始位置向左错开20像素。
+
-             * x,y同时越界
+            y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
-             */
+            if (xOut) {
-            if (xOut && yOut) {
+                if (isEdge) {
                     //向左偏移
                     x = container.getWidth() - copiedCreator.getWidth() / 2 - DELAY_X_Y - xoffset;
+                }
                 //紧贴下边界
-                y = container.getHeight() - copiedCreator.getHeight() / 2 - yoffset;
+                else {
-                return new Point(x, y);
+                    x = container.getWidth() - copiedCreator.getWidth() / 2 - xoffset;
                 }
-            /*
-            * 组件原始位置与布局边界距离小于20像素（下边界&右边界同时小于或者任意一个边界小于），
-            * 则粘贴时距离小于20像素一侧直接贴近布局边界，
-            * 距离大于20像素的一侧正常错开。
-            * x,y中只有一个越界
-            */
-            if ((xOut || yOut)) {
-                x = xOut ? container.getWidth() - copiedCreator.getWidth() / 2 - xoffset : x;
-                y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
-                return new Point(x, y);
             }
         }
         return new Point(x, y);

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

@@ -259,8 +259,11 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
             xCreator = designer.getRootComponent();
         }
         XLayoutContainer container = XCreatorUtils.getHotspotContainer(xCreator);
-        //TODO container可能为空，引发空指针异常
+
-        return xCreator.acceptType(XWParameterLayout.class) || container.acceptType(XWParameterLayout.class);
+        boolean xCreatorAccept = xCreator.acceptType(XWParameterLayout.class);
+        boolean containerAccept = container!=null && container.acceptType(XWParameterLayout.class);
+
+        return xCreatorAccept || containerAccept;
     }
 
     public void setEditingFormDesigner(BaseFormDesigner editor) {

designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java

@@ -65,7 +65,6 @@ public class UITreeComboBox extends JComboBox{
      * @param o Object
      */
     public void setSelectedItem(Object o){
-        tree.setSelectionPath((TreePath)o);
         getModel().setSelectedItem(o);
     }
 
@@ -110,7 +109,7 @@ public class UITreeComboBox extends JComboBox{
                                                       int index, boolean isSelected, boolean cellHasFocus){
             if(tree != null && tree.getSelectedTreePath().length > 0){
                 TreePath path = tree.getSelectedTreePath()[0];
-                tree.setAndScrollSelectionPath(path);
+                tree.setAndScrollSelectionPath(tree.getSelectedTreePath());
                 Object node = path.getLastPathComponent();
                 value = node;
                 TreeCellRenderer r = tree.getCellRenderer();
@@ -132,7 +131,7 @@ public class UITreeComboBox extends JComboBox{
             if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                 TreePath[] paths = tree.getSelectedTreePath();
                 if (tree != null && paths.length > 0) {
-                    tree.setAndScrollSelectionPath(paths[0]);
+                    tree.setAndScrollSelectionPath(paths);
                     setSelectedItem(paths[0]);
                     MenuSelectionManager.defaultManager().clearSelectedPath();
                 }
@@ -141,7 +140,7 @@ public class UITreeComboBox extends JComboBox{
                 tree.refreshUI();
                 TreePath[] paths = tree.getSelectedTreePath();
                 if (tree != null && paths.length > 0) {
-                    tree.setAndScrollSelectionPath(paths[0]);
+                    tree.setAndScrollSelectionPath(paths);
                     setSelectedItem(paths[0]);
                     MenuSelectionManager.defaultManager().clearSelectedPath();
                 }