Merge pull request #4934 in DESIGN/design from feature/10.0 to release/11.0

* commit 'f896362bcd25d31eb3fdd7f3e8fc9032399b4b3a':
  无jira任务，屏蔽一下功能，不在维护版本发布
  CHART-19834 svg地图报错

designer-base/src/main/java/com/fr/design/editor/editor/Editor.java

@@ -4,6 +4,7 @@
 package com.fr.design.editor.editor;
 
 import com.fr.base.BaseUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -34,6 +35,9 @@ public abstract class Editor<T> extends JComponent {
 	// 约定图片的文件名为this.getName(),处理起来方便些
 	// b:这里国际化没有考虑
 	public Icon getIcon() {
+		if (StringUtils.isEmpty(this.getIconName())) {
+			return null;
+		}
 		String iconName = "com/fr/design/images/buttonicon/" + this.getIconName() + ".png";
 		try {
 			return BaseUtils.readIcon(iconName);

designer-base/src/main/java/com/fr/env/CheckServiceDialog.java

@@ -167,7 +167,8 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         centerPanel.add(detailsPane, BorderLayout.CENTER);
         JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-        if (isOnline()) {
+        boolean Sync = false;
+        if (isOnline() && Sync) {
             ignoreButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_Ignore"));
             ignoreButton.addActionListener(this);
             syncButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local"));
@@ -183,8 +184,6 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
             buttonPanel.add(progressBar, BorderLayout.CENTER);
             buttonPanel.add(syncButton, BorderLayout.EAST);
         } else {
-            UILabel adviceLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Sync_Suggestion"));
-            centerPanel.add(adviceLabel, BorderLayout.SOUTH);
             UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm"));
             okButton.addActionListener(this);
             buttonPanel.add(okButton, BorderLayout.EAST);