Browse Source

Pull request #1714: REPORT-31381 通过alphafine搜索插件,进入插件mini商城后对应的插件信息显示缺失

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

* commit '211bf38b9a686ea5b105185624c021b749def087':
  alphafine搜索时,以关键词打开设计器商店
  REPORT-31381 通过alphafine搜索插件,进入插件mini商城后对应的插件信息显示缺失
feature/big-screen
Lanlan 5 years ago
parent
commit
9511a93f60
  1. 3
      designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
  2. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java

3
designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@ -11,7 +11,6 @@ import com.fr.general.CommonIOUtils;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext; import com.fr.general.GeneralContext;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.general.http.HttpClient;
import com.fr.general.http.HttpToolbox; import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONObject; import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -32,7 +31,6 @@ import java.awt.Window;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.net.HttpURLConnection;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
/** /**
@ -154,6 +152,7 @@ public class WebViewDlgHelper {
* @param keyword * @param keyword
* @param data * @param data
*/ */
@Deprecated
public static void showPluginInStore(String keyword, String data) { public static void showPluginInStore(String keyword, String data) {
PluginWebBridge.getHelper().showResultInStore(keyword, data); PluginWebBridge.getHelper().showResultInStore(keyword, data);
createPluginDialog(); createPluginDialog();

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java

@ -3,9 +3,7 @@ package com.fr.design.mainframe.alphafine.cell.model;
import com.fr.design.extra.WebViewDlgHelper; import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.AlphaFineConstants;
import com.fr.design.mainframe.alphafine.CellType; import com.fr.design.mainframe.alphafine.CellType;
import com.fr.json.JSONException;
import com.fr.json.JSONObject; import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
@ -104,7 +102,7 @@ public class PluginModel extends AlphaCellModel {
if (StringUtils.isBlank(this.pluginId) || !WorkContext.getCurrent().isLocal()) { if (StringUtils.isBlank(this.pluginId) || !WorkContext.getCurrent().isLocal()) {
return; return;
} }
WebViewDlgHelper.showPluginInStore(getName(), "[" + modelToJson().optString("result") + "]"); WebViewDlgHelper.createPluginDialog(getName());
} }
@Override @Override

Loading…
Cancel
Save