Merge pull request #934 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '7d209fba578597d85cd0e2709a1e73ebf62cf85a':
  update
  REPORT-17656 决策报表报表块复制后值被清空
  update
  KERNEL-582 国际化定制的地方会越来越多，想办法去掉这种if else写法

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"));
 		
 	}
 

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()));