Browse Source

Merge pull request #314 in DESIGN/design from release/10.0 to 10.0

* commit 'bba661dca90319d3744605eb5f2508ae331c5ea5':
  REPORT-10328 【10.0冒烟】@xiaoxia:表单从横向自适应切到绝对布局,缩放会有问题
  REPORT-10263 启动时连接远程服务器失败后弹窗选环境报错
master
ju 6 years ago
parent
commit
7fc1f6a32a
  1. 16
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  2. 12
      designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java
  3. 1
      designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java

16
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored

@ -395,8 +395,20 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
* 设置 app servlet 默认值 * 设置 app servlet 默认值
*/ */
private void setDefaultAppAndServlet() { private void setDefaultAppAndServlet() {
webAppNameInput.setText(FRContext.getCommonOperator().getAppName()); String appName;
servletNameInput.setText(ServerConfig.getInstance().getServletName()); String servletName;
try {
appName = FRContext.getCommonOperator().getAppName();
} catch (Exception ignored) {
appName = RemoteWorkspaceURL.DEFAULT_WEB_APP_NAME;
}
try {
servletName = ServerConfig.getInstance().getServletName();
} catch (Exception ignored) {
servletName = RemoteWorkspaceURL.DEFAULT_SERVLET_NAME;
}
webAppNameInput.setText(appName);
servletNameInput.setText(servletName);
} }

12
designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java vendored

@ -10,18 +10,18 @@ import java.util.Objects;
*/ */
public class RemoteWorkspaceURL implements FCloneable { public class RemoteWorkspaceURL implements FCloneable {
/**
* 默认 hostname
*/
private static final String DEFAULT_HOST_NAME = "${IP}";
/** /**
* 默认 web app name * 默认 web app name
*/ */
private static final String DEFAULT_WEB_APP_NAME = "webroot"; static final String DEFAULT_WEB_APP_NAME = "webroot";
/** /**
* 默认 servlet name * 默认 servlet name
*/ */
private static final String DEFAULT_SERVLET_NAME = "decision"; static final String DEFAULT_SERVLET_NAME = "decision";
/**
* 默认 hostname
*/
private static final String DEFAULT_HOST_NAME = "${IP}";
/** /**
* 默认端口 * 默认端口
*/ */

1
designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java

@ -152,6 +152,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED); wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
Component[] components = xfl.getComponents(); Component[] components = xfl.getComponents();
xfl.removeAll(); xfl.removeAll();
layout.resetStyle();
XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0)); XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0); xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
for (Component component : components) { for (Component component : components) {

Loading…
Cancel
Save