Merge pull request #402 in BA/design from ~ZACK/design:dev to dev

* commit '2346a959984da004ab9219e6e0d4897d5ed58ace':
  还原jform
  显示帮助信息改一下方案，通过widget增加description属性实现
  修改
  漏提交
  报表块共享，帮助信息显示，数据集合并到表单。以及内边距的一个bug改一下

designer_base/src/com/fr/design/data/BasicTableDataTreePane.java

@@ -3,6 +3,7 @@ package com.fr.design.data;
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.TableData;
+import com.fr.data.TableDataSource;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
@@ -423,4 +424,13 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
             this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_CONNECTION_ICON_PATH));
         }
     }
+
+    /**
+     * 合并数据集
+     * @param srcName 数据集来源(比如报表块，就是报表块的名称)
+     * @param tableDataSource 数据集
+     */
+    public void addTableData(String srcName, TableDataSource tableDataSource) {
+
+    }
 }

designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java

@@ -39,6 +39,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 public class TableDataTreePane extends BasicTableDataTreePane {
@@ -138,6 +139,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         populate(new TableDataSourceOP(tc));
         this.checkButtonEnabled();
     }
+
     protected void initbuttonGroup() {
         Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")};
         final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA};
@@ -267,4 +269,31 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     public TableDataTree getDataTree() {
         return dataTree;
     }
+
+    /**
+     * 合并数据集
+     * @param srcName 数据集来源(比如报表块，就是报表块的名称)
+     * @param tableDataSource 数据集
+     */
+    public void addTableData(String srcName, TableDataSource tableDataSource) {
+        DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
+        TableDataSource tds = tc.getBook();
+        Iterator tdIterator = tableDataSource.getTableDataNameIterator();
+        while (tdIterator.hasNext()) {
+            String tdName = (String) tdIterator.next();
+            TableData td = tableDataSource.getTableData(tdName);
+            if (tds.getTableData(tdName) != null) {//如果有同名的就拼上来源名称
+                tdName = srcName + tdName;
+            }
+            int i = 0;
+            while (tds.getTableData(tdName) != null) {
+                i++;//如果拼上名字后依然已经存在就加编号
+                tdName += i;
+            }
+            tds.putTableData(tdName, td);
+        }
+        tc.fireTargetModified();
+        tc.parameterChanged();
+        dataTree.refresh();
+    }
 }

designer_base/src/com/fr/design/icon/IconPathConstants.java

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

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 6.5.6
 * Date: 12-12-18
 * Time: 上午9:42
 * 用于保存所有图标路径的类
 */
public class IconPathConstants {
	private IconPathConstants() {

	}

	public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";

	public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png";
	public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
	public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png";
	public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png";
	public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png";
	public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
	public static final String DS_QUERY_ICON_PATH = "/com/fr/design/images/data/database.png";
	public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
	public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
	public static final String TD_REMOVE_ICON_PATH = "/com/fr/base/images/cell/control/remove.png";
	public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
	public static final String SP_SHOW_ICON_PATH = "/com/fr/design/images/data/store_procedure.png";
	public static final String STD_SHOW_ICON_PATH = "/com/fr/design/images/data/dock/serverdatabase.png";
    public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
    public static final String FORBID_ICON_PATH ="/com/fr/web/images/form/forbid.png";
}
+package com.fr.design.icon;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 6.5.6
 * Date: 12-12-18
 * Time: 上午9:42
 * 用于保存所有图标路径的类
 */
public class IconPathConstants {
	private IconPathConstants() {

	}

	public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";

	public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png";
	public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
	public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png";
	public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png";
	public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png";
	public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
	public static final String DS_QUERY_ICON_PATH = "/com/fr/design/images/data/database.png";
	public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
	public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
	public static final String TD_EL_SHARE_HELP_ICON_PATH = "/com/fr/design/images/control/help_open.png";
	public static final String TD_EL_SHARE_CLOSE_ICON_PATH = "/com/fr/design/images/control/help_close.png";
	public static final String TD_REMOVE_ICON_PATH = "/com/fr/base/images/cell/control/remove.png";
	public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
	public static final String SP_SHOW_ICON_PATH = "/com/fr/design/images/data/store_procedure.png";
	public static final String STD_SHOW_ICON_PATH = "/com/fr/design/images/data/dock/serverdatabase.png";
    public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
    public static final String FORBID_ICON_PATH ="/com/fr/web/images/form/forbid.png";
}

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

@@ -586,8 +586,19 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	}
 
 	/**
-	 * 设置共享帮助信息
+	 * 设置描述信息
 	 * @param msg 帮助信息
      */
-	public void setSharedMsg(String msg){}
+	public void setXDescrption(String msg){}
+
+	/**
+	 * 根据widget设置Xcreator描述信息
+	 * @param widget
+     */
+	public void setXDescrption(Widget widget){
+		if (widget != null) {
+			setXDescrption(widget.getDescription());
+		}
+
+	}
 }

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

@@ -157,6 +157,7 @@ public class XCreatorUtils {
             FRContext.getLogger().error("Error to create xcreator!");
             creator = new NullCreator(widget, d);
         }
+        creator.setXDescrption(widget);//设置描述信息
         return creator;
     }
 

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

@@ -35,7 +35,7 @@ import java.beans.PropertyDescriptor;
 
 public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider{
     private UILabel imageLable;
-    private JPanel coverPanel;
+    private CoverReportPane coverPanel;
 	private FormDesigner designer;
 	//缩略图
 	private BufferedImage thumbnailImage;
@@ -182,8 +182,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
      */
     public void  displayCoverPane(boolean display){
 		coverPanel.setVisible(display);
-        coverPanel.setPreferredSize(editor.getPreferredSize());
+		coverPanel.setBounds(1, 1, (int) editor.getBounds().getWidth(), (int) editor.getBounds().getHeight());
-        coverPanel.setBounds(editor.getBounds());
 		editor.repaint();
 	}
 
@@ -263,8 +262,12 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	 */
 	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
 		super.respondClick(editingMouseListener, e);
+		if (this.isHelpBtnOnFocus()) {
+			coverPanel.setMsgDisplay(e);
+		}else {
 			switchTab(e,editingMouseListener);
 		}
+	}
 
 
     private void switchTab(MouseEvent e,EditingMouseListener editingMouseListener){
@@ -280,4 +283,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
 		return new WidgetPropertyUIProvider[]{ new ElementCasePropertyUI(this)};
 	}
+
+	@Override
+	public void setXDescrption(String msg) {
+		coverPanel.setHelpMsg(msg);
+	}
 }

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

@@ -1,12 +1,19 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.BaseUtils;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.designer.beans.events.DesignerEditListener;
+import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.icon.IconPathConstants;
+import com.fr.form.share.ShareConstants;
+import com.fr.general.FRScreen;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.MouseEvent;
 
 /**
  * Created with IntelliJ IDEA.
@@ -14,31 +21,91 @@ import java.awt.*;
  * Date: 14-7-24
  * Time: 上午9:09
  */
-public class CoverReportPane extends JPanel{
+public class CoverReportPane extends JPanel {
 
     private UIButton editButton;
+    private Icon controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_CLOSE_ICON_PATH);
+    private JComponent controlButton = new JComponent() {
+        protected void paintComponent(Graphics g) {
+            g.setColor(UIConstants.NORMAL_BACKGROUND);
+            g.fillArc(0, 0, ShareConstants.SHARE_EL_CONTROL_BUTTON_HW, ShareConstants.SHARE_EL_CONTROL_BUTTON_HW,
+                    0, 360);
+            controlMode.paintIcon(this, g, 0, 0);
+        }
+    };
+
+
+    private String helpMsg;//帮助信息(后续帮助信息可能会变成标配,就直接放这边了)
+
+    private ElementCaseHelpDialog helpDialog = null;
 
     private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 60 / 100.0F);
 
-    public CoverReportPane(){
+    public CoverReportPane() {
-        setLayout(coverLayout);
+        this(StringUtils.EMPTY);
+    }
+
+    public CoverReportPane(String helpMsg) {
+        this.helpMsg = helpMsg;
+        setLayout(getCoverLayout());
         setBackground(null);
         setOpaque(false);
 
-        editButton = new UIButton(Inter.getLocText("Edit"), BaseUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)){
+        editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)) {
             @Override
             public Dimension getPreferredSize() {
-                return new Dimension(60,24);
+                return new Dimension(60, 24);
             }
         };
         editButton.setBorderPainted(false);
         editButton.setExtraPainted(false);
-        editButton.setBackground(new Color(176,196,222));
+        editButton.setBackground(new Color(176, 196, 222));
         add(editButton);
+        add(controlButton);
+        WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
+            @Override
+            public void fireCreatorModified(DesignerEvent evt) {
+                if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
+                        || evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
+                    destroyHelpDialog();
+                }
+            }
+        });
+    }
 
+    public String getHelpMsg() {
+        return helpMsg;
     }
 
-    private LayoutManager coverLayout = new LayoutManager() {
+    public void setHelpMsg(String helpMsg) {
+        this.helpMsg = helpMsg;
+    }
+
+    public void setMsgDisplay(MouseEvent e) {
+        if (helpDialog == null) {
+            controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_CLOSE_ICON_PATH);
+            controlButton.repaint();
+            helpDialog = new ElementCaseHelpDialog(DesignerContext.getDesignerFrame(), helpMsg);
+            double screenValue = FRScreen.getByDimension(Toolkit.getDefaultToolkit().getScreenSize()).getValue();
+            int offsetX = 0;
+            if (screenValue < FormArea.DEFAULT_SLIDER) {
+                offsetX = (int) ((1 - screenValue / FormArea.DEFAULT_SLIDER)
+                        * WidgetPropertyPane.getInstance().getEditingFormDesigner().getRootComponent().getWidth() / 2);
+            }
+            int rX = WestRegionContainerPane.getInstance().getWidth() + e.getX() + offsetX - 227;//弹出框宽度190加上图标的宽度27加上10的偏移
+            int rY = 165 + e.getY();//165是设计器最上面几个面板的高度
+            helpDialog.setLocationRelativeTo(DesignerContext.getDesignerFrame(), rX, rY);
+            helpDialog.showWindow();
+        } else {
+            controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH);
+            controlButton.repaint();
+            helpDialog.dispose();
+            helpDialog = null;
+        }
+    }
+
+    protected LayoutManager getCoverLayout() {
+        return new LayoutManager() {
 
             @Override
             public void removeLayoutComponent(Component comp) {
@@ -60,13 +127,16 @@ public class CoverReportPane extends JPanel{
                 int height = parent.getParent().getHeight();
                 int preferWidth = editButton.getPreferredSize().width;
                 int preferHeight = editButton.getPreferredSize().height;
-            editButton.setBounds((width - preferWidth)/2, (height  - preferHeight)/2, preferWidth, preferHeight);
+                editButton.setBounds((width - preferWidth) / 2, (height - preferHeight) / 2, preferWidth, preferHeight);
+                controlButton.setBounds((width - 28), 0, 27, 27);
             }
 
             @Override
             public void addLayoutComponent(String name, Component comp) {
             }
         };
+    }
+
 
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
@@ -77,4 +147,14 @@ public class CoverReportPane extends JPanel{
         g2d.setComposite(oldComposite);
         super.paint(g);
     }
+
+    public void destroyHelpDialog() {
+        if (helpDialog != null) {
+            controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_HELP_ICON_PATH);
+            controlButton.repaint();
+            helpDialog.dispose();
+            helpDialog = null;
+        }
+    }
+
 }

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

@@ -1,14 +1,5 @@
 package com.fr.design.mainframe;
 
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Rectangle;
-import java.awt.event.MouseEvent;
-
-import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.beans.location.MoveUtils;
 import com.fr.design.designer.beans.AdapterBus;
@@ -29,6 +20,11 @@ import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
+import javax.swing.event.MouseInputAdapter;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
 /**
  * 普通模式下的鼠标点击、位置处理器
  */
@@ -292,14 +288,24 @@ public class EditingMouseListener extends MouseInputAdapter {
         if (component.isReport()) {
             xElementCase = (XElementCase)component;
 			UIButton button = (UIButton)xElementCase.getCoverPane().getComponent(0);
+            JComponent button1= (JComponent) xElementCase.getCoverPane().getComponent(1);
             if(designer.getCursor().getType() ==Cursor.HAND_CURSOR) {
                 designer.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
             } // component.getParent() 是报表块所在的XWTitleLayout
             int minX = button.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue();
+            int minX1 = button1.getX() + getParentPositionX(component, 0) - designer.getArea().getHorizontalValue();
             int minY = button.getY() + getParentPositionY(component, 0) - designer.getArea().getVerticalValue();
-            if(e.getX() + GAP >  minX && e.getX() - GAP < minX + button.getWidth()){
+            int minY1 = button1.getY() + getParentPositionY(component, 0) - designer.getArea().getVerticalValue();
-                if( e.getY() + GAP > minY && e.getY() - GAP < minY + button.getHeight()){
+			if (e.getX() + GAP - xElementCase.getInsets().left > minX && e.getX() - GAP - xElementCase.getInsets().left < minX + button.getWidth()) {
+				if (e.getY() + GAP - xElementCase.getInsets().top > minY && e.getY() - GAP - xElementCase.getInsets().top < minY + button.getHeight()) {
+					designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+				}
+			}
+			xElementCase.setHelpBtnOnFocus(false);
+			if (e.getX() + GAP - xElementCase.getInsets().left > minX1 && e.getX() - GAP - xElementCase.getInsets().left < minX1 + button1.getWidth()) {
+				if (e.getY() + GAP - xElementCase.getInsets().top > minY1 && e.getY() - GAP - xElementCase.getInsets().top < minY1 + button1.getHeight()) {
 					designer.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+					xElementCase.setHelpBtnOnFocus(true);
 				}
 			}
 			xElementCase.displayCoverPane(true);

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

@@ -0,0 +1,73 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.itextarea.UITextArea;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @author zack
+ * @date 2016-10-14
+ * @since 8.0
+ */
+public class ElementCaseHelpDialog extends UIDialog {
+
+    private static final int OUTER_WIDTH = 190;
+    private static final int OUTER_HEIGHT = 120;
+
+
+    private String helpMsg;
+    private UIScrollPane helpArea;
+
+
+    public ElementCaseHelpDialog(Frame parent, String helpMsg) {
+        super(parent);
+        this.helpMsg = helpMsg;
+        setUndecorated(true);
+        initHelpArea();
+        JPanel panel = (JPanel) getContentPane();
+        initComponents(panel);
+        setSize(new Dimension(OUTER_WIDTH, OUTER_HEIGHT));
+    }
+
+    private void initHelpArea() {
+        UITextArea textArea = new UITextArea(helpMsg);
+        textArea.setEditable(false);
+        textArea.setBorder(null);
+        helpArea = new UIScrollPane(textArea);
+        helpArea.setBounds(0, 0, 190, 120);
+        helpArea.setBorder(null);
+    }
+
+    private void initComponents(JPanel contentPane) {
+        contentPane.setLayout(new BorderLayout());
+        add(helpArea, BorderLayout.CENTER);
+    }
+
+    /**
+     * 打开帮助框
+     */
+    public void showWindow() {
+        setVisible(true);
+        this.setResizable(false);
+    }
+
+    /**
+     * 略
+     */
+    @Override
+    public void checkValid() throws Exception {
+
+    }
+
+    public void setLocationRelativeTo(JFrame c, int x, int y) {
+        int dx = 0, dy = 0;
+        Point compLocation = c.getLocationOnScreen();//获取设计器Jframe坐标作为相对位置原点
+        setLocation(dx + x, dy + y);
+        dx = compLocation.x;
+        dy = compLocation.y + c.getRootPane().getY();//加上底层容器的y坐标(其实就是设计器最上方图标栏的高度)
+        setLocation(dx + x, dy + y);
+    }
+}

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

@@ -1,20 +1,8 @@
 package com.fr.design.mainframe;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.dnd.DropTarget;
-import java.awt.dnd.DropTargetDragEvent;
-import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.util.ArrayList;
-
-import javax.swing.BorderFactory;
-import javax.swing.JWindow;
-
 import com.fr.base.BaseUtils;
+import com.fr.design.DesignModelAdapter;
+import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.HoverPainter;
 import com.fr.design.designer.beans.Painter;
@@ -25,10 +13,20 @@ import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.form.share.ShareLoader;
+import com.fr.form.ui.ElCaseBindInfo;
+import com.fr.form.ui.SharableElementCaseEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+
 /**
  * 添加模式下鼠标事件处理器。
  */
@@ -70,7 +68,7 @@ public class FormCreatorDropTarget extends DropTarget {
             // 如果是容器，则调用其acceptComponent接受组件
             AddingModel model = designer.getAddingModel();
 
-            boolean chartEnter2Para =!addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class);
+            boolean chartEnter2Para = !addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class);
             boolean formSubmit2Adapt = !addingModel.getXCreator().canEnterIntoAdaptPane() && container.acceptType(XWFitLayout.class);
 
             if (model != null && !chartEnter2Para && !formSubmit2Adapt) {
@@ -85,6 +83,14 @@ public class FormCreatorDropTarget extends DropTarget {
             //SetSelection时要确保选中的是最顶层的布局
             //tab布局添加的时候是初始化了XWCardLayout，实际上最顶层的布局是XWCardMainBorderLayout
             XCreator addingXCreator = addingModel.getXCreator();
+            if (addingXCreator.isShared()) {
+                String shareId = addingXCreator.getShareId();
+                SharableElementCaseEditor sharableEditor = ShareLoader.getLoader().getSharedElCaseEditorById(shareId);
+                ElCaseBindInfo bindInfo = ShareLoader.getLoader().getElCaseBindInfoById(shareId);
+                if (sharableEditor != null && bindInfo != null) {
+                    TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(),sharableEditor.getTableDataSource());
+                }
+            }
             Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData();
             designer.getSelectionModel().setSelectedCreators(
                     FormSelectionUtils.rebuildSelection(xCreator, new Widget[]{widget}));
@@ -134,9 +140,9 @@ public class FormCreatorDropTarget extends DropTarget {
                 //获取painter的时候要考虑布局之间嵌套的问题
                 XLayoutContainer xLayoutContainer = container.getTopLayout();
                 if (xLayoutContainer != null && xLayoutContainer.getParent() != null
-						&& ((XLayoutContainer)xLayoutContainer.getParent()).acceptType(XWAbsoluteLayout.class)){
+                        && ((XLayoutContainer) xLayoutContainer.getParent()).acceptType(XWAbsoluteLayout.class)) {
-					if(!xLayoutContainer.isEditable()){
+                    if (!xLayoutContainer.isEditable()) {
-						xLayoutContainer = (XLayoutContainer)xLayoutContainer.getParent();
+                        xLayoutContainer = (XLayoutContainer) xLayoutContainer.getParent();
                     }
                 }
                 painter = AdapterBus.getContainerPainter(designer,
@@ -172,30 +178,30 @@ public class FormCreatorDropTarget extends DropTarget {
         designer.repaint();
     }
 
-    private void promptUser(int x, int y, XLayoutContainer container){
+    private void promptUser(int x, int y, XLayoutContainer container) {
-        if (!addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class)){
+        if (!addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class)) {
             promptButton.setText(Inter.getLocText("FR-Designer_Forbid_Drag_into_Para_Pane"));
-            promptWidgetForbidEnter(x ,y ,container);
+            promptWidgetForbidEnter(x, y, container);
-        } else if (!addingModel.getXCreator().canEnterIntoAdaptPane() && container.acceptType(XWFitLayout.class)){
+        } else if (!addingModel.getXCreator().canEnterIntoAdaptPane() && container.acceptType(XWFitLayout.class)) {
             promptButton.setText(Inter.getLocText("FR-Designer_Forbid_Drag_into_Adapt_Pane"));
-            promptWidgetForbidEnter(x ,y , container);
+            promptWidgetForbidEnter(x, y, container);
         } else {
             cancelPromptWidgetForbidEnter();
         }
     }
 
-    private void promptWidgetForbidEnter(int x,int y, XLayoutContainer container){
+    private void promptWidgetForbidEnter(int x, int y, XLayoutContainer container) {
         container.setBorder(BorderFactory.createLineBorder(Color.RED, Constants.LINE_MEDIUM));
-        int screen_X = (int)designer.getArea().getLocationOnScreen().getX();
+        int screen_X = (int) designer.getArea().getLocationOnScreen().getX();
-        int screen_Y = (int)designer.getArea().getLocationOnScreen().getY();
+        int screen_Y = (int) designer.getArea().getLocationOnScreen().getY();
         this.promptWindow.setSize(promptWindow.getPreferredSize());
         this.promptWindow.setPreferredSize(promptWindow.getPreferredSize());
-        promptWindow.setLocation( screen_X + x + GAP ,screen_Y + y + GAP);
+        promptWindow.setLocation(screen_X + x + GAP, screen_Y + y + GAP);
         promptWindow.setVisible(true);
     }
 
-    private void cancelPromptWidgetForbidEnter(){
+    private void cancelPromptWidgetForbidEnter() {
-        if (designer.getParaComponent() != null){
+        if (designer.getParaComponent() != null) {
             designer.getParaComponent().setBorder(BorderFactory.createLineBorder(XCreatorConstants.LAYOUT_SEP_COLOR, Constants.LINE_THIN));
         }
         designer.getRootComponent().setBorder(BorderFactory.createLineBorder(XCreatorConstants.LAYOUT_SEP_COLOR, Constants.LINE_THIN));
@@ -204,6 +210,7 @@ public class FormCreatorDropTarget extends DropTarget {
 
     /**
      * 拖拽进入
+     *
      * @param dtde 事件
      */
     public void dragEnter(DropTargetDragEvent dtde) {
@@ -213,6 +220,7 @@ public class FormCreatorDropTarget extends DropTarget {
 
     /**
      * 拖拽移动经过
+     *
      * @param dtde 事件
      */
     public void dragOver(DropTargetDragEvent dtde) {
@@ -222,6 +230,7 @@ public class FormCreatorDropTarget extends DropTarget {
 
     /**
      * 拖拽事件
+     *
      * @param dtde 事件
      */
     public void dropActionChanged(DropTargetDragEvent dtde) {
@@ -229,6 +238,7 @@ public class FormCreatorDropTarget extends DropTarget {
 
     /**
      * 拖拽离开
+     *
      * @param dte 事件
      */
     public void dragExit(DropTargetEvent dte) {
@@ -237,6 +247,7 @@ public class FormCreatorDropTarget extends DropTarget {
 
     /**
      * 拖拽释放
+     *
      * @param dtde 事件
      */
     public void drop(DropTargetDropEvent dtde) {