diff --git a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
index 8e9fd5b32..4fabbd6da 100644
--- a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
@@ -6,6 +6,7 @@ import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -19,7 +20,7 @@ public class VideoAction extends UpdateAction
 		 this.setMenuKeySet(VIDEO);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/video.png"));
+		 this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/bbs/video.png"));
 		
 	}
 
@@ -30,7 +31,7 @@ public class VideoAction extends UpdateAction
 		if (GeneralContext.getLocale().equals(Locale.US)) {
 			url = CloudCenter.getInstance().acquireUrlByKind("bbs.video.en");
 		} else {
-	  		url = CloudCenter.getInstance().acquireUrlByKind("bbs.video");
+			url = CloudCenter.getInstance().acquireUrlByKind("bbs.video");
 		}
 		BrowseUtils.browser(url);
 
diff --git a/designer-realize/src/main/java/com/fr/grid/GridCornerMouseHandler.java b/designer-realize/src/main/java/com/fr/grid/GridCornerMouseHandler.java
index 4c4342291..e68bd907b 100644
--- a/designer-realize/src/main/java/com/fr/grid/GridCornerMouseHandler.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridCornerMouseHandler.java
@@ -29,6 +29,8 @@ public class GridCornerMouseHandler extends MouseInputAdapter {
 
 	private void doSelectAll() {
 		ElementCasePane reportPane = this.gridCorner.getElementCasePane();
+		// 全选时,停止编辑状态
+		reportPane.getGrid().stopEditing();
 		ColumnRow lastColumnRow = GridUtils.getAdjustLastColumnRowOfReportPane(reportPane);
 
 		reportPane.setSelection(new CellSelection(0, 0, lastColumnRow.getColumn(), lastColumnRow.getRow()));
diff --git a/designer-realize/src/main/java/com/fr/start/SplashContext.java b/designer-realize/src/main/java/com/fr/start/SplashContext.java
index 17eff62ba..441bf0f60 100644
--- a/designer-realize/src/main/java/com/fr/start/SplashContext.java
+++ b/designer-realize/src/main/java/com/fr/start/SplashContext.java
@@ -175,4 +175,4 @@ public class SplashContext {
             return "/com/fr/design/images/splash_10.gif";
         }
     }
-}
+}
\ No newline at end of file