Merge pull request #501 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0

REPORT-11403 查询结果出来的横向滚动条位置偏上了

* commit '7452f05304f7da97c6718375a943241e36dc83c4':
  原先的判断网络断开的逻辑，用swingworker搜索的时候，偶现性的会卡住。
  UT暂时不提交
  UT
  REPORT-11403 查询结果出来的横向滚动条位置偏上了 调整下纵向滚动条位置

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineHelper.java

@@ -22,9 +22,6 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.json.JSONUtils;
 import com.fr.stable.StringUtils;
-import com.fr.third.org.apache.http.HttpStatus;
-import com.fr.third.org.apache.http.StatusLine;
-import com.fr.third.org.apache.http.client.methods.HttpGet;
 
 import java.util.List;
 
@@ -159,10 +156,9 @@ public class AlphaFineHelper {
      * @return
      */
     public static boolean isNetworkOk(){
-        HttpGet getHelp = new HttpGet(URL_FOR_TEST_NETWORK);
         try {
-            StatusLine statusLine = HttpToolbox.getHttpClient(URL_FOR_TEST_NETWORK).execute(getHelp).getStatusLine();
+            HttpToolbox.get(URL_FOR_TEST_NETWORK);
-            return statusLine.getStatusCode() == HttpStatus.SC_OK;
+            return true;
         } catch (Exception ignore) {
             // 网络异常
             return false;

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/RobotPreviewPane.java

@@ -77,7 +77,7 @@ public class RobotPreviewPane extends JPanel {
         });
         editorPane.setEditable(false);
         UIScrollPane jScrollPane = new UIScrollPane(editorPane);
-        jScrollPane.getVerticalScrollBar().setBorder(BorderFactory.createEmptyBorder(0, 2, 30, 0));
+        jScrollPane.getVerticalScrollBar().setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
         jScrollPane.setBorder(BorderFactory.createMatteBorder(5, 10, 0, 10, Color.white));
         if (((RobotModel) model).isHotItemModel()) {
             this.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT - HOT_TITLE_AREA_HEIGHT));