Browse Source

Pull request #6181: REPORT-60392 【固定布局-原布局推荐4.1】决策报表-自适应布局-新建空白模板/带布局模板,右侧组件目录树处,body名字变空了

Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x

* commit 'ced3811436596e0f566c77c1436f02d5e1d38754':
  REPORT-59545 设计器很多报错提示弹窗的交互有问题
  REPORT-60392
  REPORT-60392 【固定布局-原布局推荐4.1】决策报表-自适应布局-新建空白模板/带布局模板,右侧组件目录树处,body名字变空了
research/11.0
fanglei 3 years ago
parent
commit
6071341394
  1. 6
      designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
  2. 2
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  3. 9
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
  4. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java

6
designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@ -175,7 +175,11 @@ public abstract class UIDialog extends JDialog {
try { try {
checkValid(); checkValid();
} catch (Exception exp) { } catch (Exception exp) {
FineJOptionPane.showMessageDialog(this, exp.getMessage()); FineJOptionPane.showMessageDialog(
this,
exp.getMessage(),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.WARNING_MESSAGE);
return; return;
} }

2
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -655,7 +655,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
FormulaPane.this, FormulaPane.this,
formulaValidMessage + ".", formulaValidMessage + ".",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
JOptionPane.INFORMATION_MESSAGE); JOptionPane.WARNING_MESSAGE);
} }
}; };

9
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -1010,15 +1010,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
} }
private void refreshCenter(Widget centerWidget, XLayoutContainer formLayoutContainer) { private void refreshCenter(Widget centerWidget, XLayoutContainer formLayoutContainer) {
// 不存在center块, 说明是新建的模板
if (centerWidget == null) {
XLayoutContainer layoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(new WFitLayout("body"));
layoutContainer.setSize(LARGE_PREFERRED_SIZE);
setRootComponent(layoutContainer);
formLayoutContainer.add(rootComponent, WBorderLayout.CENTER);
return;
}
XLayoutContainer centerContainer = (XLayoutContainer) XCreatorUtils.createXCreator(centerWidget); XLayoutContainer centerContainer = (XLayoutContainer) XCreatorUtils.createXCreator(centerWidget);
Dimension d = new Dimension(); Dimension d = new Dimension();
d.width = ((WFitLayout) centerWidget).getContainerWidth(); d.width = ((WFitLayout) centerWidget).getContainerWidth();

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java

@ -294,7 +294,9 @@ public class NewFormPane extends BasicPane {
} }
private Form initEmptyBodyForm() { private Form initEmptyBodyForm() {
WFitLayout body = new WFitLayout(); WFitLayout body = new WFitLayout("body");
body.setContainerWidth(WBorderLayout.DEFAULT_WIDTH);
body.setContainerHeight(WBorderLayout.DEFAULT_HEIGHT);
WBorderLayout borderLayout = new WBorderLayout("form"); WBorderLayout borderLayout = new WBorderLayout("form");
borderLayout.addCenter(body); borderLayout.addCenter(body);
return new Form(borderLayout); return new Form(borderLayout);

Loading…
Cancel
Save