Browse Source

Merge pull request #1 in ~WIM.ZHAI/xdesign from release/10.0 to 10.0

* commit '7000fbb3c60bec1aa2f6baa2116014655c3b873b':
  CHART-3399 dialog.pack()说要写在子组件里
  单元格设置面板的预览单元格那个checkbox的值没有正确的被set到CellGUIAttr,导致值没有被write到模板。
10.0
Wim.Zhai 6 years ago
parent
commit
4e6b583ab1
  1. 1
      designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

1
designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java

@ -142,6 +142,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
} }
}); });
dialog.pack();
dialog.setModal(true); dialog.setModal(true);
dialog.setVisible(true); dialog.setVisible(true);
} }

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@ -427,7 +427,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
} }
} }
if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"))) { if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))) {
cellGUIAttr.setPreviewContent(previewCellContent.isSelected()); cellGUIAttr.setPreviewContent(previewCellContent.isSelected());
} }

Loading…
Cancel
Save