Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~xiaofu.qin/chart-design into release/9.0

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

@@ -32,7 +32,8 @@ import com.fr.general.xml.GeneralXMLTools;
 import com.fr.io.importer.Excel2007ReportImporter;
 import com.fr.io.importer.ExcelReportImporter;
 import com.fr.main.impl.WorkBook;
-import com.fr.quickeditor.ChartQuickEditor;
+import com.fr.quickeditor.chartquick.BasicChartQuickEditor;
+import com.fr.quickeditor.chartquick.FloatChartQuickEditor;
 import com.fr.quickeditor.cellquick.*;
 import com.fr.quickeditor.floatquick.FloatImageQuickEditor;
 import com.fr.quickeditor.floatquick.FloatStringQuickEditor;
@@ -119,7 +120,7 @@ public class DesignerModule extends DesignModule {
         ActionFactory.registerCellEditor(BiasTextPainter.class, CellBiasTextPainterEditor.class);
         ActionFactory.registerCellEditor(BufferedImage.class, CellImageQuickEditor.class);
 
-        ActionFactory.registerChartCellEditorInEditor(ChartQuickEditor.class);
+        ActionFactory.registerChartCellEditorInEditor(BasicChartQuickEditor.class);
 
         Set<ElementUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING);
         for (ElementUIProvider provider : providers) {
@@ -139,11 +140,10 @@ public class DesignerModule extends DesignModule {
     private void registerFloatEditor() {
         ActionFactory.registerFloatEditor(String.class, FloatStringQuickEditor.class);
         ActionFactory.registerFloatEditor(Formula.class, FloatStringQuickEditor.class);
-
-        FloatImageQuickEditor floatImageQuickEditor = new FloatImageQuickEditor();
         ActionFactory.registerFloatEditor(Image.class, FloatImageQuickEditor.class);
         ActionFactory.registerFloatEditor(BufferedImage.class, FloatImageQuickEditor.class);
-        ActionFactory.registerChartFloatEditorInEditor(ChartQuickEditor.class);
+
+        ActionFactory.registerChartFloatEditorInEditor(FloatChartQuickEditor.class);
     }
 
     /**

designer/src/com/fr/design/parameter/ParameterDefinitePane.java

@@ -75,12 +75,23 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
         this.setBorder(null);
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         setComponentBg(this);
-//		formParaDesignEditor = new FormParaDesigner(new FormParameterUI());
         paraDesignEditor = DesignModuleFactory.getFormParaDesigner();
         if (paraDesignEditor == null) {
             return;
         }
         paraDesignEditor.initWidgetToolbarPane();
+
+        this.add(paraDesignEditor.createWrapper(), BorderLayout.CENTER);
+
+        setButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/parametersetting.png"));
+        setButton.set4ToolbarButton();
+        isshowWindowItem = new JCheckBoxMenuItem(Inter.getLocText("ParameterD-Show_Parameter_Window"));
+        isdelayItem = new JCheckBoxMenuItem(Inter.getLocText("ParameterD-Delay_Playing"));
+
+        initListeners();
+    }
+
+    private void initListeners() {
         ((TargetComponent) paraDesignEditor).addTargetModifiedListener(new TargetModifiedListener() {
             @Override
             public void targetModified(TargetModifiedEvent e) {
@@ -93,7 +104,6 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
         paraDesignEditor.addListener(this);
 
         propertyChangeListener = new PropertyChangeAdapter() {
-
             @Override
             public void propertyChange() {
                 if (isEditing) {
@@ -102,12 +112,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
                 }
             }
         };
-        this.add(paraDesignEditor.createWrapper(), BorderLayout.CENTER);
-//        WidgetToolBarPane.getRecentSearchManger(formParaDesignEditor);
 
-        setButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/parametersetting.png"));
-        setButton.set4ToolbarButton();
-        isshowWindowItem = new JCheckBoxMenuItem(Inter.getLocText("ParameterD-Show_Parameter_Window"));
         isshowWindowItem.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
@@ -116,9 +121,8 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
                 }
             }
         });
-        isdelayItem = new JCheckBoxMenuItem(Inter.getLocText("ParameterD-Delay_Playing"));
-        isdelayItem.addItemListener(new ItemListener() {
 
+        isdelayItem.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
                 if (propertyChangeListener != null) {
@@ -128,7 +132,6 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
             }
         });
 
-
         setButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -298,7 +301,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
      */
     public void refreshParameter() {
         if (paraDesignEditor != null) {
-            paraDesignEditor.refreshParameter(this);
+            paraDesignEditor.refreshParameter(this, this.workBook);
         }
     }
 

designer/src/com/fr/poly/creator/ChartBlockCreator.java

@@ -1,29 +1,22 @@
-/*
- * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
- */
 package com.fr.poly.creator;
 
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-import javax.swing.*;
-
-import com.fr.base.ScreenResolution;
 import com.fr.design.DesignState;
 import com.fr.design.designer.TargetComponent;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.chart.MiddleChartComponent;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.selection.QuickEditor;
-import com.fr.quickeditor.ChartQuickEditor;
+import com.fr.quickeditor.chartquick.PolyChartQuickEditor;
 import com.fr.report.poly.PolyChartBlock;
 import com.fr.stable.unit.FU;
 import com.fr.stable.unit.UNIT;
 import com.fr.stable.unit.UnitRectangle;
 
+import javax.swing.*;
+import java.awt.*;
+
 /**
  * @author richer
  * @since 6.5.4 创建于2011-5-10
@@ -45,12 +38,13 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
         super(block);
     }
 
-	public void setResolution(int resolution){
+    public void setResolution(int resolution) {
         this.resolution = resolution;
     }
 
     /**
      * 初始化
+     *
      * @return 初始化的控件.
      */
     public JComponent initMonitor() {
@@ -86,7 +80,6 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
      * 检测按钮状态
      *
      * @date 2015-2-5-上午11:33:46
-	 * 
      */
     public void checkButtonEnable() {
         if (editor == null) {
@@ -107,14 +100,11 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
     }
 
 
-
     /**
      * 获取当前工具栏组
      *
      * @return 工具栏组
-	 * 
      * @date 2015-2-5-上午11:29:07
-	 * 
      */
     public ToolBarDef[] toolbars4Target() {
         return new ToolBarDef[0];
@@ -124,9 +114,7 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
      * 在Form的工具栏组
      *
      * @return 组件数组
-	 * 
      * @date 2015-2-5-上午11:31:46
-	 * 
      */
     public JComponent[] toolBarButton4Form() {
         return new JComponent[0];
@@ -134,18 +122,20 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
 
     /**
      * 目标的列表
+     *
      * @return 返回列表.
      */
     public MenuDef[] menus4Target() {
         return new MenuDef[0];
     }
 
-    public  int getMenuState(){
+    public int getMenuState() {
         return DesignState.POLY_SHEET;
     }
 
     /**
      * 模板的Menu
+     *
      * @return 模板的menu
      */
     public ShortCut[] shortcut4TemplateMenu() {
@@ -159,7 +149,7 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
 
     @Override
     public QuickEditor getQuickEditor(TargetComponent tc) {
-		ChartQuickEditor quitEditor = new ChartQuickEditor();
+        PolyChartQuickEditor quitEditor = new PolyChartQuickEditor();
         quitEditor.populate(tc);
         return quitEditor;
     }

designer/src/com/fr/quickeditor/CellQuickEditor.java

@@ -66,7 +66,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f};
-        double[] rowSize = {p, p};
+        double[] rowSize = {p, f};
         JComponent centerBody = createCenterBody();
         JPanel topContent = initTopContent();
         if (isScrollAll()) {

designer/src/com/fr/quickeditor/ChartQuickEditor.java

@@ -1,54 +0,0 @@
-package com.fr.quickeditor;
-
-import com.fr.base.chart.BaseChartCollection;
-//import com.fr.chart.chartattr.ChartCollection;
-import com.fr.design.designer.TargetComponent;
-import com.fr.design.gui.chart.BaseChartPropertyPane;
-import com.fr.design.mainframe.ElementCasePane;
-import com.fr.design.module.DesignModuleFactory;
-import com.fr.design.selection.QuickEditor;
-import com.fr.grid.selection.CellSelection;
-import com.fr.grid.selection.FloatSelection;
-import com.fr.grid.selection.Selection;
-import com.fr.poly.PolyDesigner;
-import com.fr.poly.creator.ChartBlockEditor;
-import com.fr.report.cell.Elem;
-
-import java.awt.*;
-
-public class ChartQuickEditor extends QuickEditor<TargetComponent>{
-    // kunsnat: editingPropertyPane初始化  避开设计器启动, 在用到的时候再初始化.
-	//private BaseChartPropertyPane editingPropertyPane = null;
-	public ChartQuickEditor() {
-		setLayout(new BorderLayout());
-		setBorder(null);
-	}
-
-	@Override
-	protected void refresh() {
-		BaseChartPropertyPane editingPropertyPane = null;
-		BaseChartCollection collection = null;
-		if(tc instanceof PolyDesigner) {
-			ChartBlockEditor chartBlockEditor = (ChartBlockEditor)((PolyDesigner)tc).getSelection().getEditor();
-			collection = chartBlockEditor.getValue().getChartCollection();
-			
-			add(editingPropertyPane = DesignModuleFactory.getChartPropertyPane(), BorderLayout.CENTER);
-			editingPropertyPane.setSupportCellData(false);
-		} else {
-			Selection selection = ((ElementCasePane)tc).getSelection();
-			Elem element = null;
-			if(selection instanceof CellSelection) {
-				CellSelection cs = (CellSelection)selection;
-				element = ((ElementCasePane)tc).getEditingElementCase().getCellElement(cs.getColumn(), cs.getRow());
-			} else if(selection instanceof FloatSelection){
-				FloatSelection fs = (FloatSelection)selection;
-				element = ((ElementCasePane)tc).getEditingElementCase().getFloatElement(fs.getSelectedFloatName());
-			}
-			collection = (BaseChartCollection) element.getValue();
-			add(editingPropertyPane = DesignModuleFactory.getChartPropertyPane(), BorderLayout.CENTER);
-
-		}
-		editingPropertyPane.populateChartPropertyPane(collection, tc);
-	}
-
-}

designer/src/com/fr/quickeditor/chartquick/BasicChartQuickEditor.java

@@ -0,0 +1,51 @@
+package com.fr.quickeditor.chartquick;
+
+import com.fr.base.chart.BaseChartCollection;
+import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.actions.insert.cell.ChartCellAction;
+import com.fr.design.gui.chart.BaseChartPropertyPane;
+import com.fr.design.module.DesignModuleFactory;
+import com.fr.grid.selection.CellSelection;
+import com.fr.grid.selection.Selection;
+import com.fr.quickeditor.CellQuickEditor;
+import com.fr.report.cell.Elem;
+
+import javax.swing.*;
+
+
+public class BasicChartQuickEditor extends CellQuickEditor {
+    private BaseChartPropertyPane editingPropertyPane;
+
+    public BasicChartQuickEditor() {
+        super();
+    }
+
+    @Override
+    public JComponent createCenterBody() {
+        editingPropertyPane = DesignModuleFactory.getChartPropertyPane();
+        editingPropertyPane.setBorder(BorderFactory.createEmptyBorder());
+        return editingPropertyPane;
+    }
+
+    @Override
+    public boolean isScrollAll() {
+        return false;
+    }
+
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(ChartCellAction.class);
+    }
+
+    @Override
+    protected void refreshDetails() {
+        BaseChartCollection collection;
+        Selection selection = tc.getSelection();
+        Elem element;
+        CellSelection cs = (CellSelection) selection;
+        element = tc.getEditingElementCase().getCellElement(cs.getColumn(), cs.getRow());
+        collection = (BaseChartCollection) element.getValue();
+        editingPropertyPane.populateChartPropertyPane(collection, tc);
+    }
+
+}

designer/src/com/fr/quickeditor/chartquick/FloatChartQuickEditor.java

@@ -0,0 +1,34 @@
+package com.fr.quickeditor.chartquick;
+
+import com.fr.base.chart.BaseChartCollection;
+import com.fr.design.gui.chart.BaseChartPropertyPane;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.module.DesignModuleFactory;
+import com.fr.design.selection.QuickEditor;
+import com.fr.grid.selection.FloatSelection;
+import com.fr.grid.selection.Selection;
+import com.fr.report.cell.Elem;
+
+import java.awt.*;
+
+
+public class FloatChartQuickEditor extends QuickEditor<ElementCasePane> {
+    public FloatChartQuickEditor() {
+        setLayout(new BorderLayout());
+        setBorder(null);
+    }
+
+    @Override
+    protected void refresh() {
+        BaseChartPropertyPane editingPropertyPane;
+        BaseChartCollection collection;
+        Selection selection = tc.getSelection();
+        Elem element;
+        FloatSelection fs = (FloatSelection) selection;
+        element = tc.getEditingElementCase().getFloatElement(fs.getSelectedFloatName());
+        collection = (BaseChartCollection) element.getValue();
+        add(editingPropertyPane = DesignModuleFactory.getChartPropertyPane(), BorderLayout.CENTER);
+        editingPropertyPane.populateChartPropertyPane(collection, tc);
+    }
+
+}

designer/src/com/fr/quickeditor/chartquick/PolyChartQuickEditor.java

@@ -0,0 +1,31 @@
+package com.fr.quickeditor.chartquick;
+
+import com.fr.base.chart.BaseChartCollection;
+import com.fr.design.designer.TargetComponent;
+import com.fr.design.gui.chart.BaseChartPropertyPane;
+import com.fr.design.module.DesignModuleFactory;
+import com.fr.design.selection.QuickEditor;
+import com.fr.poly.PolyDesigner;
+import com.fr.poly.creator.ChartBlockEditor;
+
+import java.awt.*;
+
+
+public class PolyChartQuickEditor extends QuickEditor<TargetComponent> {
+    public PolyChartQuickEditor() {
+        setLayout(new BorderLayout());
+        setBorder(null);
+    }
+
+    @Override
+    protected void refresh() {
+        BaseChartPropertyPane editingPropertyPane;
+        BaseChartCollection collection;
+        ChartBlockEditor chartBlockEditor = (ChartBlockEditor) ((PolyDesigner) tc).getSelection().getEditor();
+        collection = chartBlockEditor.getValue().getChartCollection();
+        add(editingPropertyPane = DesignModuleFactory.getChartPropertyPane(), BorderLayout.CENTER);
+        editingPropertyPane.setSupportCellData(false);
+        editingPropertyPane.populateChartPropertyPane(collection, tc);
+    }
+
+}

designer_base/src/com/fr/design/actions/core/ActionFactory.java

@@ -24,11 +24,11 @@ public class ActionFactory {
     private ActionFactory() {
     }
 
-    private static Map<Class, Class<? extends QuickEditor>> floatEditor = new HashMap<Class, Class<? extends QuickEditor>>();
+    private static Map<Class, Class<? extends QuickEditor>> floatEditor = new HashMap<>();
 
     private static Class chartCollectionClass = null;
 
-    private static Map<Class, Class<? extends QuickEditor>> cellEditor = new HashMap<Class, Class<? extends QuickEditor>>();
+    private static Map<Class, Class<? extends QuickEditor>> cellEditor = new HashMap<>();
 
     private static UpdateAction chartPreStyleAction = null;
 
@@ -98,7 +98,7 @@ public class ActionFactory {
     }
 
     /**
-     * kunsnat: 图表注册 悬浮元素编辑器 , 因为ChartCollecion和ChartQuickEditor一个在Chart,一个在Designer, 所以分开注册.
+     * kunsnat: 图表注册 悬浮元素编辑器 , 因为ChartCollection和ChartQuickEditor一个在Chart,一个在Designer, 所以分开注册.
      *
      * @param editor 待说明
      */

designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@@ -302,6 +302,8 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
         ShortCut addItem = addItemShortCut().getShortCut();
         addItem.intoJToolBar(topToolBar);
         topToolBar.validate();
+        this.controlUpdatePane = createControlUpdatePane();//REPORT-4841 刷新一下编辑面板
+        cardPane.add(controlUpdatePane, "EDIT");
 
         this.repaint();
     }

designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java

@@ -28,7 +28,7 @@ public class BasicPropertyPane extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         widgetName = new UITextField();
-        widgetName.setGlobalName(Inter.getLocText("FR-Designer_Widget_Name"));
+        widgetName.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p};

designer_base/src/com/fr/design/parameter/ParameterDesignerProvider.java

@@ -3,6 +3,7 @@ package com.fr.design.parameter;
 import com.fr.base.Parameter;
 import com.fr.base.parameter.ParameterUI;
 import com.fr.design.mainframe.AuthorityEditPane;
+import com.fr.design.mainframe.JTemplate;
 
 import javax.swing.*;
 import java.awt.*;
@@ -31,6 +32,8 @@ public interface ParameterDesignerProvider {
 
     void refreshParameter(ParaDefinitePane paraDefinitePane);
 
+    void refreshParameter(ParaDefinitePane paraDefinitePane, JTemplate jt);
+
     boolean isWithQueryButton();
 
     java.util.List<String> getAllXCreatorNameList();

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

@@ -136,6 +136,27 @@ public class SelectionModel {
     private void unselectedPaste() {
         if (designer.getClass().equals(FormDesigner.class)) {
             if (selection.getSelectedCreator() instanceof XWFitLayout) {
+                pasteXWFitLayout();
+            } else {
+                //绝对布局
+                //编辑器外面还有两层容器，使用designer.getRootComponent()获取到的是编辑器中层的容器，不是编辑器表层
+                //当前选择的就是编辑器表层
+                FormSelectionUtils.paste2Container(designer, (XLayoutContainer) selection.getSelectedCreator(),
+                        clipboard,
+                        DELTA_X_Y,
+                        DELTA_X_Y);
+            }
+        } else {
+            //cpt本地组件复用，编辑器就一层，是最底层，使用designer.getRootComponent()就可以获取到
+            //使用selection.getSelectedCreator()也应该是可以获取到的。
+            FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
+                    clipboard,
+                    DELTA_X_Y,
+                    DELTA_X_Y);
+        }
+    }
+
+    private void pasteXWFitLayout() {
         if (selection.getSelectedCreator().getClass().equals(XWTabFitLayout.class)) {
             XLayoutContainer container = (XLayoutContainer) selection.getSelectedCreator();
             //tab布局编辑器内部左上角第一个坐标点
@@ -167,23 +188,6 @@ public class SelectionModel {
                         rectangle.y + DELTA_X_Y);
             }
         }
-            } else {
-                //绝对布局
-                //编辑器外面还有两层容器，使用designer.getRootComponent()获取到的是编辑器中层的容器，不是编辑器表层
-                //当前选择的就是编辑器表层
-                FormSelectionUtils.paste2Container(designer, (XLayoutContainer) selection.getSelectedCreator(),
-                        clipboard,
-                        DELTA_X_Y,
-                        DELTA_X_Y);
-            }
-        } else {
-            //cpt本地组件复用，编辑器就一层，是最底层，使用designer.getRootComponent()就可以获取到
-            //使用selection.getSelectedCreator()也应该是可以获取到的。
-            FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
-                    clipboard,
-                    DELTA_X_Y,
-                    DELTA_X_Y);
-        }
     }
 
     /**
@@ -227,7 +231,11 @@ public class SelectionModel {
         XCreator[] roots = selection.getSelectedCreators();
 
         if (roots.length > 0) {
+            boolean isInPara = true;  // 在参数面板内删除控件
             for (XCreator creator : roots) {
+                if (isInPara && !(creator.getParent() instanceof XWParameterLayout)) {
+                    isInPara = false;
+                }
                 if (creator.acceptType(XWParameterLayout.class)) {
                     designer.removeParaComponent();
                 }
@@ -236,8 +244,7 @@ public class SelectionModel {
                 // 清除被选中的组件
                 selection.reset();
             }
-            setSelectedCreator(designer.getRootComponent());
+            setSelectedCreator(isInPara ? designer.getParaComponent() : designer.getRootComponent());
-            FormSelectionUtils.rebuildSelection(designer);
             // 触发事件
             designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_DELETED);
             designer.repaint();
@@ -401,19 +408,33 @@ public class SelectionModel {
         if (x < (bounds.x - XCreatorConstants.RESIZE_BOX_SIZ)) {
             return Location.outer;
         } else if ((x >= (bounds.x - XCreatorConstants.RESIZE_BOX_SIZ)) && (x <= bounds.x)) {
+            return getDirectionLeft(bounds, y);
+        } else if ((x > bounds.x) && (x < (bounds.x + bounds.width))) {
+            return getDirectionCenter(bounds, y);
+        } else if ((x >= (bounds.x + bounds.width))
+                && (x <= (bounds.x + bounds.width + XCreatorConstants.RESIZE_BOX_SIZ))) {
+            return getDirectionRight(bounds, y);
+        } else {
+            return Location.outer;
+        }
+    }
+
+    private Direction getDirectionRight(Rectangle bounds, int y) {
         if (y < (bounds.y - XCreatorConstants.RESIZE_BOX_SIZ)) {
             return Location.outer;
         } else if ((y >= (bounds.y - XCreatorConstants.RESIZE_BOX_SIZ)) && (y <= bounds.y)) {
-                return Location.left_top;
+            return Location.right_top;
         } else if ((y > bounds.y) && (y < (bounds.y + bounds.height))) {
-                return Location.left;
+            return Location.right;
         } else if ((y >= (bounds.y + bounds.height))
                 && (y <= (bounds.y + bounds.height + XCreatorConstants.RESIZE_BOX_SIZ))) {
-                return Location.left_bottom;
+            return Location.right_bottom;
         } else {
             return Location.outer;
         }
-        } else if ((x > bounds.x) && (x < (bounds.x + bounds.width))) {
+    }
+
+    private Direction getDirectionCenter(Rectangle bounds, int y) {
         if (y < (bounds.y - XCreatorConstants.RESIZE_BOX_SIZ)) {
             return Location.outer;
         } else if ((y >= (bounds.y - XCreatorConstants.RESIZE_BOX_SIZ)) && (y <= bounds.y)) {
@@ -426,20 +447,18 @@ public class SelectionModel {
         } else {
             return Location.outer;
         }
-        } else if ((x >= (bounds.x + bounds.width))
+    }
-                && (x <= (bounds.x + bounds.width + XCreatorConstants.RESIZE_BOX_SIZ))) {
+
+    private Direction getDirectionLeft(Rectangle bounds, int y) {
         if (y < (bounds.y - XCreatorConstants.RESIZE_BOX_SIZ)) {
             return Location.outer;
         } else if ((y >= (bounds.y - XCreatorConstants.RESIZE_BOX_SIZ)) && (y <= bounds.y)) {
-                return Location.right_top;
+            return Location.left_top;
         } else if ((y > bounds.y) && (y < (bounds.y + bounds.height))) {
-                return Location.right;
+            return Location.left;
         } else if ((y >= (bounds.y + bounds.height))
                 && (y <= (bounds.y + bounds.height + XCreatorConstants.RESIZE_BOX_SIZ))) {
-                return Location.right_bottom;
+            return Location.left_bottom;
-            } else {
-                return Location.outer;
-            }
         } else {
             return Location.outer;
         }

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

@@ -37,16 +37,7 @@ import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.design.mainframe.AuthorityEditPane;
+import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.EastRegionContainerPane;
-import com.fr.design.mainframe.FormArea;
-import com.fr.design.mainframe.FormDesigner;
-import com.fr.design.mainframe.FormDesignerModeForSpecial;
-import com.fr.design.mainframe.FormParaPane;
-import com.fr.design.mainframe.FormWidgetDetailPane;
-import com.fr.design.mainframe.WidgetPropertyPane;
-import com.fr.design.mainframe.WidgetToolBarPane;
 import com.fr.design.parameter.ParaDefinitePane;
 import com.fr.design.parameter.ParameterDesignerProvider;
 import com.fr.design.parameter.ParameterPropertyPane;
@@ -79,6 +70,9 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
     private static final int SECOND_H_LOCATION = 170;
     private static final int ADD_HEIGHT = 20;
     private static final int H_GAP = 105;
+    private static final int SUBMIT_BUTTON_H_LOCATION = 270;
+    private static final int PARA_IMAGE_SHIFT_X = -4;
+    private static final int FORM_AREA_PADDING_LEFT = 13;
 
     private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png");
 
@@ -175,12 +169,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
 
             @Override
             public void fireCreatorModified(DesignerEvent evt) {
-                if (evt.getCreatorEventID() == DesignerEvent.CREATOR_ADDED
+                if (evt.getCreatorEventID() != DesignerEvent.CREATOR_SELECTED) {
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_PASTED
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_EDITED
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_RENAMED) {
                     paraDefinitePane.setParameterArray(
                             paraDefinitePane.getNoRepeatParas(DesignModelAdapter.getCurrentModelAdapter().getParameters()));
                     paraDefinitePane.refreshParameter();
@@ -196,7 +185,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
      */
     public Component createWrapper() {
         FormArea area = new FormArea(this, false);
-        area.setBorder(BorderFactory.createEmptyBorder(0, 13, 0, 0));
+        area.setBorder(BorderFactory.createEmptyBorder(0, FORM_AREA_PADDING_LEFT, 0, 0));
         return area;
     }
 
@@ -224,6 +213,16 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
      * @param p 参数面板
      */
     public void refreshParameter(ParaDefinitePane p) {
+        refreshParameter(p, DesignerContext.getDesignerFrame().getSelectedJTemplate());
+    }
+
+    /**
+     * 刷新参数
+     *
+     * @param p 参数面板
+     * @param jt 当前模版
+     */
+    public void refreshParameter(ParaDefinitePane p, JTemplate jt) {
         XLayoutContainer rootContainer = this.getRootComponent();
         java.util.List<String> namelist = getAllXCreatorNameList(rootContainer);
         // parameterArray是报表的所有参数, nameList是已经在参数面板添加过控件的参数名
@@ -240,8 +239,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         }
         ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(
                 p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray());
-        EastRegionContainerPane.getInstance().setParameterHeight(ParameterPropertyPane.getInstance().getPreferredSize().height);
+        ParameterPropertyPane.getInstance().refreshState(jt);
-
     }
 
     /**
@@ -439,7 +437,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
             }
             for (Parameter p : paras) {
                 if (p.getName().equalsIgnoreCase(creator.toData().getWidgetName())) {
-                    g.drawImage(paraImage, creator.getX() - 4, creator.getY() + 2, null);
+                    g.drawImage(paraImage, creator.getX() + PARA_IMAGE_SHIFT_X, creator.getY() + 2, null);
                     break;
                 }
             }
@@ -617,7 +615,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         formSubmitButton.setWidgetName("Search");
         formSubmitButton.setText(Inter.getLocText("FR-Designer_Query"));
         xCreator = XCreatorUtils.createXCreator(formSubmitButton);
-        if (!(this.autoAddComponent(xCreator, 270, FIRST_V_LOCATION + V_COMPONENT_GAP
+        if (!(this.autoAddComponent(xCreator, SUBMIT_BUTTON_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP
                 * (currentIndex / NUM_IN_A_LINE)))) {
             return false;
         }

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

@@ -123,6 +123,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     private static final int SECOND_H_LOCATION = 170;
     private static final int ADD_HEIGHT = 20;
     private static final int H_GAP = 105;
+    private static final int SUBMIT_BUTTON_H_LOCATION = 270;
 
     public FormDesigner(Form form) {
         this(form, null);
@@ -257,7 +258,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         currentIndex++;
         parameterArray = (Parameter[]) ArrayUtils.removeElement(parameterArray, parameter);
         refreshParameter();
-        EastRegionContainerPane.getInstance().refreshDownPane();
+        fireTargetModified();
     }
 
     /**
@@ -294,14 +295,14 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         formSubmitButton.setWidgetName("Search");
         formSubmitButton.setText(Inter.getLocText("FR-Designer_Query"));
         xCreator = XCreatorUtils.createXCreator(formSubmitButton);
-        if (!(this.autoAddComponent(xCreator, 270, FIRST_V_LOCATION + V_COMPONENT_GAP
+        if (!(this.autoAddComponent(xCreator, SUBMIT_BUTTON_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP
                 * (currentIndex / NUM_IN_A_LINE)))) {
             return;
         }
         currentIndex = currentIndex + NUM_IN_A_LINE - currentIndex % NUM_IN_A_LINE;
         parameterArray = (Parameter[]) ArrayUtils.removeElement(parameterArray, parameter);
         refreshParameter();
-        EastRegionContainerPane.getInstance().refreshDownPane();
+        fireTargetModified();
     }
 
     /**
@@ -667,9 +668,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                 // 只有选择组件时不触发模版更新，其他都要触发
                 if (evt.getCreatorEventID() != DesignerEvent.CREATOR_SELECTED) {
                     FormDesigner.this.fireTargetModified();
-                    //bug59192
+                    setParameterArray(getNoRepeatParas(getTarget().getParameters()));
-                    //setParameterArray(getNoRepeatParas(getTarget().getParameters()));
+                    refreshParameter();
-                    //refreshParameter();
                 }
             }
 
@@ -1147,7 +1147,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      * 同步
      */
     public void populateRootSize() {
-
+        // do nothing
     }
 
     /**
@@ -1233,6 +1233,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      */
     @Override
     public void stopEditing() {
+        // do nothing
     }
 
     /**
@@ -1412,7 +1413,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                 parent = parent.getParent();
             }
 
-            Object[] components = path.toArray();
+            Object[] components = (Object[]) path.toArray();
             if (components.length == 0) {
                 return null;
             }

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

@@ -328,10 +328,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
     private void setPropertyPaneChange(XComponent comp) {
         if (comp == null) {
-            ParameterPropertyPane.getInstance().setAddParaPaneVisible(false);
+            ParameterPropertyPane.getInstance().setAddParaPaneVisible(false, this);
             return;
         }
-        ParameterPropertyPane.getInstance().setAddParaPaneVisible(comp instanceof XWParameterLayout);
+        ParameterPropertyPane.getInstance().setAddParaPaneVisible(isAddParaPaneVisible(comp), this);
         editingComponent = comp.createToolPane(this, formDesign);
         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.FORM);
         if (BaseUtils.isAuthorityEditing()) {
@@ -342,6 +342,16 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         }
     }
 
+    private boolean isAddParaPaneVisible(XComponent comp) {
+        boolean isVisible = false;
+        try {
+            isVisible = comp instanceof XWParameterLayout || ((XCreator) comp).getParent() instanceof XWParameterLayout;
+        } catch (Throwable throwable) {
+            // 发生异常则返回 false
+        }
+        return isVisible;
+    }
+
     public JComponent getEditingPane() {
         return editingComponent;
     }
@@ -546,6 +556,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
                 //撤销的时候要重新选择的body布局
                 this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(),
                         formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()}));
+                refreshToolArea();
             } else {
                 String widgetName = this.formDesign.getElementCaseContainerName();
                 //这儿太坑了，u.getForm() 与 getTarget内容不一样
@@ -718,7 +729,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.FORM);
         EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(WidgetPropertyPane.getInstance(formDesign));
         ParameterPropertyPane parameterPropertyPane = ParameterPropertyPane.getInstance(formDesign);
-        parameterPropertyPane.setAddParaPaneVisible(false);
+        parameterPropertyPane.setAddParaPaneVisible(false, this);
         EastRegionContainerPane.getInstance().addParameterPane(parameterPropertyPane);
         EastRegionContainerPane.getInstance().setParameterHeight(parameterPropertyPane.getPreferredSize().height);
 

designer_form/src/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java

@@ -27,6 +27,8 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane {
             pane2.add(otherOtherConfig);
         }
         visibleCheckBox = new UICheckBox(Inter.getLocText("Widget-Visible"), true);
+        visibleCheckBox.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
+
         visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         pane2.add(visibleCheckBox);
         this.add(pane2, BorderLayout.CENTER);

designer_form/src/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java

@@ -17,6 +17,8 @@ public class FormBasicWidgetPropertyPane extends BasicSetVisiblePropertyPane {
 
     public UICheckBox createOtherConfig() {
         enableCheckBox = new UICheckBox(Inter.getLocText("Enabled"), true);
+        enableCheckBox.setGlobalName(Inter.getLocText("FR-Designer_Basic"));
+
         enableCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         return enableCheckBox;
     }

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -210,7 +210,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     public void updateCreator() {
         currentEditorDefinePane.setGlobalName(getGlobalName());
         Widget widget = currentEditorDefinePane.updateBean();
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Widget_Name")) && widgetPropertyPane != null) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) {
             widgetPropertyPane.update(widget);
             xCreator.resetCreatorName(widget.getWidgetName());
             designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED);

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

@@ -4,10 +4,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.FormDesigner;
-import com.fr.design.mainframe.FormHierarchyTreePane;
-import com.fr.design.mainframe.JForm;
 
 import javax.swing.*;
 import java.awt.*;
@@ -86,19 +83,24 @@ public class ParameterPropertyPane extends JPanel{
         this.add(addParaPane, BorderLayout.CENTER);
     }
 
+    // 显示或隐藏添加参数面板
+	public void refreshState(JTemplate jt) {
+		setAddParaPaneVisible(toolbarPane.hasSelectedLabelItem(), jt);
+	}
+
 	// 显示或隐藏添加参数面板
 	public void refreshState() {
-		setAddParaPaneVisible(toolbarPane.hasSelectedLabelItem());
+		refreshState(DesignerContext.getDesignerFrame().getSelectedJTemplate());
 	}
 
-    public void setAddParaPaneVisible(boolean isVisible) {
+    public void setAddParaPaneVisible(boolean isVisible, JTemplate jt) {
         if (isVisible == addParaPane.isVisible() || formHierarchyTreePaneWrapper == null) {
             return;
         }
         // 表单中，只有添加并选中参数面板时，才显示
 		boolean hideInJForm;
         try {
-            hideInJForm = DesignerContext.getDesignerFrame().getSelectedJTemplate() instanceof JForm &&
+            hideInJForm = jt instanceof JForm &&
                     !(FormHierarchyTreePane.getInstance().getComponentTree().getSelectionPath().getLastPathComponent() instanceof XWParameterLayout);
         } catch (NullPointerException ex) {
             hideInJForm = true;

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

@@ -35,6 +35,7 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 	private static final int BUTTON_HEIGHT = 20;
 	private static final int WIDTH = 225;
 	private static final int L_H = 18;
+	private static final int LABEL_PADDING_LEFT = 4;
 
 	public ParameterToolBarPane() {
 		this.setLayout(new FlowParameterPaneLayout());
@@ -47,9 +48,9 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 				return new Dimension(super.getPreferredSize().width, 18);
 			}
 		};
-		label.setText(Inter.getLocText("FR-Following_parameters_are_not_generated")+":");
+		label.setText(Inter.getLocText("FR-Following_parameters_are_not_generated") + ":");
 		label.setHorizontalAlignment(SwingConstants.LEFT);
-		label.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0));
+		label.setBorder(BorderFactory.createEmptyBorder(0, LABEL_PADDING_LEFT, 0, 0));
 		this.add(label);
 
 		addAll = new UIButton(Inter.getLocText("FR-Designer_Add_all"));
@@ -68,7 +69,7 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 
 	public Parameter getTargetParameter(UIButton button) {
 		int index = parameterSelectedLabellist.indexOf(button);
-		if(index < 0 || index > parameterList.length - 1) {
+		if (index < 0 || index > parameterList.length - 1) {
 			return null;
 		}
 		return parameterList[index];
@@ -82,7 +83,6 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 		this.add(label);
 
 		if (parameterArray.length == 0) {
-			ParameterPropertyPane.getInstance().refreshState();
 			this.setVisible(false);
 			this.repaint();
 			return;
@@ -103,7 +103,6 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 
 		this.add(addAll);
 		this.doLayout();
-		ParameterPropertyPane.getInstance().refreshState();
 		this.repaint();
 	}
 
@@ -124,12 +123,15 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 	private class FlowParameterPaneLayout implements LayoutManager {
 
 		public FlowParameterPaneLayout() {
+            // do nothing
 		}
 
 		public void addLayoutComponent(String name, Component comp) {
+            // do nothing
 		}
 
 		public void removeLayoutComponent(Component comp) {
+            // do nothing
 		}
 
 		public Dimension preferredLayoutSize(Container parent) {
@@ -137,7 +139,7 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 
 			layoutContainer(parent);
 
-			int h= ((parameterSelectedLabellist.size() == 0) ? 0 : breakid * (BUTTON_HEIGHT + GAP_V) + GAP_BV + L_H + GAP_H + addAll.getPreferredSize().height);
+			int h= (parameterSelectedLabellist.isEmpty() ? 0 : breakid * (BUTTON_HEIGHT + GAP_V) + GAP_BV + L_H + GAP_H + addAll.getPreferredSize().height);
 			return new Dimension(w, h);
 		}
 
@@ -155,7 +157,7 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 			breakid = 1;
 			for (UIButton tab : parameterSelectedLabellist) {
 				Dimension dim = tab.getPreferredSize();
-				if(x + dim.width > width) {
+				if (x + dim.width > width) {
 					breakid++;
 					x = 0;
 					y += (dim.height + GAP_V);