Pull request #1680: REPORT-31836 && REPORT-31874

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '16c7a6f4ddb6079424848a24d7301b86ab2c0b2e':
  REPORT-31836 && REPORT-31874

designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java

@@ -21,10 +21,11 @@ public class PMDialogAction implements OSBasedAction {
              DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null);
              return;
          }
-        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() && !OperatingSystem.isLinux()) {
+//        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() && !OperatingSystem.isLinux()) {
-            UpmFinder.showUPMDialog();
+//            UpmFinder.showUPMDialog();
-        } else {
+//        } else {
-            WebViewDlgHelper.createPluginDialog();
+//        }
-        }
+        // 直接这里屏蔽掉 防止有设置过 导致配置数据库值为true 即使设置界面屏蔽也没用
+        WebViewDlgHelper.createPluginDialog();
     }
 }

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

@@ -10,6 +10,7 @@ import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
 import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
@@ -67,7 +68,12 @@ public class RecommendSearchManager implements AlphaFineSearchProvider {
                         if (jsonArray != null && jsonArray.length() > 0) {
                             for (int i = 0; i < jsonArray.length(); i++) {
                                 AlphaFineHelper.checkCancel();
-                                AlphaCellModel alphaCellModel = CellModelHelper.getModelFromJson((JSONObject) jsonArray.get(i));
+                                JSONObject jo = jsonArray.getJSONObject(i);
+                                JSONObject innerJo = jo.getJSONObject("result");
+                                if (innerJo != null && ComparatorUtils.equals("failed", innerJo.get("state"))) {
+                                    continue;
+                                }
+                                AlphaCellModel alphaCellModel = CellModelHelper.getModelFromJson(jo);
                                 if (alphaCellModel != null && !alreadyContain(alphaCellModel) && !this.recommendModelList.contains(alphaCellModel)) {
                                     this.recommendModelList.add(alphaCellModel);
                                 }