Browse Source

Merge pull request #17172 in DESIGN/design from bugfix/11.0 to feature/x

* commit '0bc096c6d83b4dce9a5ca28203dd0b2a1552dbfb':
  fix: npe #REPORT-125730
feature/x
superman 4 weeks ago
parent
commit
a16fc23401
  1. 7
      designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java

7
designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java

@ -4,6 +4,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.ui.ModernUIConstants;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.CommonUtils;
import com.fr.stable.StringUtils;
import com.fr.value.ClearableLazyValue;
import com.fr.web.struct.AssembleComponent;
import com.teamdev.jxbrowser.engine.ChromiumBinariesExtractionException;
@ -55,8 +56,10 @@ public class JxEngine {
.addScheme(Scheme.of(ModernUIConstants.EMB_TAG),
new NxInterceptRequestCallback(this::getComponent, this::getParameterMap));
String options = System.getProperty("jxbrowser.chrome.setup.options");
for (String s : options.split(SPLIT)) {
builder.addSwitch(s);
if (StringUtils.isNotEmpty(options)) {
for (String s : options.split(SPLIT)) {
builder.addSwitch(s);
}
}
if (disableWebSecurity) {
builder.addSwitch("--disable-web-security");

Loading…
Cancel
Save