diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java
index 1cba4df96..3073a62db 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java
@@ -1 +1 @@
-package com.fr.design.data.datapane.sqlpane;

import com.fr.data.core.DataCoreUtils;
import com.fr.data.core.db.TableProcedure;
import com.fr.design.actions.UpdateAction;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;

import javax.swing.JPopupMenu;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import java.awt.Point;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.dnd.DropTarget;
import java.awt.dnd.DropTargetAdapter;
import java.awt.dnd.DropTargetContext;
import java.awt.dnd.DropTargetDragEvent;
import java.awt.dnd.DropTargetDropEvent;
import java.awt.event.ActionEvent;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 13-5-2
 * Time: 上午11:09
 */
public class SQLEditPane extends RSyntaxTextArea {
    public static final boolean REQUEST_DROPTARGET = true;
    public static final boolean UNREQUEST_DROPTARGET = false;

    public SQLEditPane() {
		this(REQUEST_DROPTARGET);
	}

    public SQLEditPane(boolean requestDroptarget) {
        super();

		setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL);

		setAnimateBracketMatching(true);
		setAntiAliasingEnabled(true);
		setAutoIndentEnabled(true);
		setCodeFoldingEnabled(true);
		setUseSelectedTextColor(true);
		setCloseCurlyBraces(true);
		setBracketMatchingEnabled(true);
		setAntiAliasingEnabled(true);
		setCloseMarkupTags(true);
		setLineWrap(true);
        if (requestDroptarget) {
            new SQLPaneDropTarget(this);
        }

    }


	private static class SQLPaneDropTarget extends DropTargetAdapter {
		private TableProcedure sqlTable;

		public SQLPaneDropTarget(SQLEditPane sqlTextPane) {
			new DropTarget(sqlTextPane, this);
		}

		public void dragEnter(DropTargetDragEvent dtde) {
			dtde.acceptDrag(dtde.getDropAction());
		}

		public void dragOver(DropTargetDragEvent dtde) {
			dtde.acceptDrag(dtde.getDropAction());
		}

		public void drop(DropTargetDropEvent dtde) {
			Point p = dtde.getLocation();
			DropTargetContext dtc = dtde.getDropTargetContext();
			SQLEditPane jTextPane = (SQLEditPane) dtc.getComponent();

			try {
				Transferable tr = dtde.getTransferable();
				DataFlavor[] flavors = tr.getTransferDataFlavors();
				for (int i = 0; i < flavors.length; i++) {
					if (!tr.isDataFlavorSupported(flavors[i])) {
						continue;
					}
					dtde.acceptDrop(dtde.getDropAction());
					Object userObj = tr.getTransferData(flavors[i]);

					if (userObj instanceof TableProcedure) {
						this.sqlTable = (TableProcedure) userObj;

						JPopupMenu popupMenu = new JPopupMenu();
						popupMenu.add(new NameAction(jTextPane, sqlTable).createMenuItem());
						if (ComparatorUtils.equals(sqlTable.getType(), TableProcedure.PROCEDURE)) {
							popupMenu.add(new CallAction(jTextPane, sqlTable).createMenuItem());
						} else {
							popupMenu.add(new SelectAction(jTextPane, sqlTable).createMenuItem());
						}

						GUICoreUtils.showPopupMenu(popupMenu, jTextPane,
								(int) p.getX() + 1, (int) p.getY() + 1);
					}

					dtde.dropComplete(true);
				}

				dtde.rejectDrop();
			} catch (Exception e) {
				dtde.rejectDrop();
			}
		}

		class NameAction extends UpdateAction {
			private SQLEditPane sqlTextPane;
			private TableProcedure sqlTable;

			public NameAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) {
				this.sqlTextPane = sqlTextPane;
				this.sqlTable = sqlTable;

				this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"));
				this.setMnemonic('N');
				this.setSmallIcon(UIConstants.BLACK_ICON);
			}

			public void actionPerformed(ActionEvent evt) {
				if (sqlTable != null) {
					insertStringTo(sqlTextPane, sqlTable.toString());
				}

			}
		}

		class SelectAction extends UpdateAction {
			private SQLEditPane sqlTextPane;
			private TableProcedure sqlTable;

			public SelectAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) {
				this.sqlTextPane = sqlTextPane;
				this.sqlTable = sqlTable;

				this.setName("SELECT *");
				this.setMnemonic('s');
				this.setSmallIcon(UIConstants.BLACK_ICON);
			}

			public void actionPerformed(ActionEvent evt) {
				//daniel: 添加参数
				insertStringTo(sqlTextPane, DataCoreUtils.createSelectSQL(sqlTable.getSchema(), sqlTable.getName(), sqlTable.getDialect()));
			}
		}

		class CallAction extends UpdateAction {
			private SQLEditPane sqlTextPane;
			private TableProcedure sqlTable;

			public CallAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) {
				this.sqlTextPane = sqlTextPane;
				this.sqlTable = sqlTable;

				this.setName("CALL PROCEDURE ");
				this.setMnemonic('s');
				this.setSmallIcon(UIConstants.BLACK_ICON);
			}

			public void actionPerformed(ActionEvent evt) {
				StringBuffer sBuf = new StringBuffer();
				sBuf.append("{call ");
				if (sqlTable != null) {
					sBuf.append(sqlTable.toString()).append("()");
				}
				sBuf.append('}');

				insertStringTo(sqlTextPane, sBuf.toString());
			}
		}

		private void insertStringTo(SQLEditPane sqlTextPane, String str) {
			Document document = sqlTextPane.getDocument();
			try {
				document.insertString(sqlTextPane.getCaretPosition(), str, null);
			} catch (BadLocationException badLocationException) {
                FineLoggerFactory.getLogger().error(badLocationException.getMessage(), badLocationException);
			}

			sqlTextPane.requestFocus();
		}
	}
}
\ No newline at end of file
+package com.fr.design.data.datapane.sqlpane;

import com.fr.data.core.DataCoreUtils;
import com.fr.data.core.db.TableProcedure;
import com.fr.design.actions.UpdateAction;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;

import javax.swing.Icon;
import javax.swing.JPopupMenu;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import java.awt.Point;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.dnd.DropTarget;
import java.awt.dnd.DropTargetAdapter;
import java.awt.dnd.DropTargetContext;
import java.awt.dnd.DropTargetDragEvent;
import java.awt.dnd.DropTargetDropEvent;
import java.awt.event.ActionEvent;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 13-5-2
 * Time: 上午11:09
 */
public class SQLEditPane extends RSyntaxTextArea {
    public static final boolean REQUEST_DROPTARGET = true;
    public static final boolean UNREQUEST_DROPTARGET = false;

    public SQLEditPane() {
		this(REQUEST_DROPTARGET);
	}

    public SQLEditPane(boolean requestDroptarget) {
        super();

		setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL);

		setAnimateBracketMatching(true);
		setAntiAliasingEnabled(true);
		setAutoIndentEnabled(true);
		setCodeFoldingEnabled(true);
		setUseSelectedTextColor(true);
		setCloseCurlyBraces(true);
		setBracketMatchingEnabled(true);
		setAntiAliasingEnabled(true);
		setCloseMarkupTags(true);
		setLineWrap(true);
        if (requestDroptarget) {
            new SQLPaneDropTarget(this);
        }

    }


	private static class SQLPaneDropTarget extends DropTargetAdapter {
		private TableProcedure sqlTable;

		public SQLPaneDropTarget(SQLEditPane sqlTextPane) {
			new DropTarget(sqlTextPane, this);
		}

		public void dragEnter(DropTargetDragEvent dtde) {
			dtde.acceptDrag(dtde.getDropAction());
		}

		public void dragOver(DropTargetDragEvent dtde) {
			dtde.acceptDrag(dtde.getDropAction());
		}

		public void drop(DropTargetDropEvent dtde) {
			Point p = dtde.getLocation();
			DropTargetContext dtc = dtde.getDropTargetContext();
			SQLEditPane jTextPane = (SQLEditPane) dtc.getComponent();

			try {
				Transferable tr = dtde.getTransferable();
				DataFlavor[] flavors = tr.getTransferDataFlavors();
				for (int i = 0; i < flavors.length; i++) {
					if (!tr.isDataFlavorSupported(flavors[i])) {
						continue;
					}
					dtde.acceptDrop(dtde.getDropAction());
					Object userObj = tr.getTransferData(flavors[i]);

					if (userObj instanceof TableProcedure) {
						this.sqlTable = (TableProcedure) userObj;

						JPopupMenu popupMenu = new JPopupMenu();
						popupMenu.add(new NameAction(jTextPane, sqlTable).createMenuItem());
						if (ComparatorUtils.equals(sqlTable.getType(), TableProcedure.PROCEDURE)) {
							popupMenu.add(new CallAction(jTextPane, sqlTable).createMenuItem());
						} else {
							popupMenu.add(new SelectAction(jTextPane, sqlTable).createMenuItem());
						}

						GUICoreUtils.showPopupMenu(popupMenu, jTextPane,
								(int) p.getX() + 1, (int) p.getY() + 1);
					}

					dtde.dropComplete(true);
				}

				dtde.rejectDrop();
			} catch (Exception e) {
				dtde.rejectDrop();
			}
		}

		class NameAction extends UpdateAction {
			private SQLEditPane sqlTextPane;
			private TableProcedure sqlTable;

			public NameAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) {
				this.sqlTextPane = sqlTextPane;
				this.sqlTable = sqlTable;

				this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"));
				this.setMnemonic('N');
				this.setSmallIcon((Icon) null);
			}

			public void actionPerformed(ActionEvent evt) {
				if (sqlTable != null) {
					insertStringTo(sqlTextPane, sqlTable.toString());
				}

			}
		}

		class SelectAction extends UpdateAction {
			private SQLEditPane sqlTextPane;
			private TableProcedure sqlTable;

			public SelectAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) {
				this.sqlTextPane = sqlTextPane;
				this.sqlTable = sqlTable;

				this.setName("SELECT *");
				this.setMnemonic('s');
				this.setSmallIcon((Icon) null);
			}

			public void actionPerformed(ActionEvent evt) {
				//daniel: 添加参数
				insertStringTo(sqlTextPane, DataCoreUtils.createSelectSQL(sqlTable.getSchema(), sqlTable.getName(), sqlTable.getDialect()));
			}
		}

		class CallAction extends UpdateAction {
			private SQLEditPane sqlTextPane;
			private TableProcedure sqlTable;

			public CallAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) {
				this.sqlTextPane = sqlTextPane;
				this.sqlTable = sqlTable;

				this.setName("CALL PROCEDURE ");
				this.setMnemonic('s');
				this.setSmallIcon((Icon) null);
			}

			public void actionPerformed(ActionEvent evt) {
				StringBuffer sBuf = new StringBuffer();
				sBuf.append("{call ");
				if (sqlTable != null) {
					sBuf.append(sqlTable.toString()).append("()");
				}
				sBuf.append('}');

				insertStringTo(sqlTextPane, sBuf.toString());
			}
		}

		private void insertStringTo(SQLEditPane sqlTextPane, String str) {
			Document document = sqlTextPane.getDocument();
			try {
				document.insertString(sqlTextPane.getCaretPosition(), str, null);
			} catch (BadLocationException badLocationException) {
                FineLoggerFactory.getLogger().error(badLocationException.getMessage(), badLocationException);
			}

			sqlTextPane.requestFocus();
		}
	}
}
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
index b2827a36c..f9427a5a8 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
@@ -260,7 +260,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 condition.setEditingComponent(tc);
             }
             //丢掉icon,修改按钮名称为编辑
-            condition.setSmallIcon(UIConstants.BLACK_ICON);
+            condition.setSmallIcon((Icon) null);
             condition.setName(Toolkit.i18nText("Fine-Design_Basic_Edit"));
             conditionUIButton = new UIButton(condition);
             Component[][] components = new Component[][]{
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java
index a515c7204..0550e23ff 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java
@@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
 
 import com.fr.quickeditor.CellQuickEditor;
 
+import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -48,7 +49,7 @@ public class CellRichTextEditor extends CellQuickEditor {
     protected void refreshDetails() {
         RichTextCellAction subReportCellAction = new RichTextCellAction(tc);
         subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
-        subReportCellAction.setSmallIcon(UIConstants.BLACK_ICON);
+        subReportCellAction.setSmallIcon((Icon) null);
         richTextButton.setAction(subReportCellAction);
     }
 
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java
index e6c3ddf82..3614c3be0 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java
@@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
 
 import com.fr.quickeditor.CellQuickEditor;
 
+import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -44,7 +45,7 @@ public class CellSubReportEditor extends CellQuickEditor {
     protected void refreshDetails() {
         SubReportCellAction subReportCellAction = new SubReportCellAction(tc);
         subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
-        subReportCellAction.setSmallIcon(UIConstants.BLACK_ICON);
+        subReportCellAction.setSmallIcon((Icon) null);
         subReportButton.setAction(subReportCellAction);
     }