Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java

@@ -157,7 +157,9 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
      * @param names 名字
      */
     public void addNames(String names) {
-        this.names.add(names);
+        if (names != null) {
+            this.names.add(names);
+        }
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java

@@ -65,12 +65,12 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
             }
             SearchResult searchResult = new SearchResult();
             for (int j = 0; j < searchText.length; j++) {
-                String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j] + AlphaFineConstants.FIRST_PAGE;
+                String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j];
                 try {
                     String result = HttpToolbox.get(url);
                     AlphaFineHelper.checkCancel();
                     JSONObject jsonObject = new JSONObject(result);
-                    JSONArray jsonArray = jsonObject.optJSONArray("docdata");
+                    JSONArray jsonArray = jsonObject.optJSONArray("list");
                     if (jsonArray != null) {
 
                         for (int i = 0; i < jsonArray.length(); i++) {