Browse Source

Merge pull request #2791 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '2a0e19e50348fa4e8d70cdf623bd2f1bca396350':
  REPORT-41858 被选中的按钮不显示
  CHART-16548 调整轴标签显示方式组件宽度
  REPORT-42639 远程对接平台密码-没有远程权限,点击切换目录,弹窗内容不应该有‘修改密码’
research/11.0
superman 4 years ago
parent
commit
ca355fa680
  1. 4
      designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
  2. 1
      designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleBlock.java
  3. 10
      designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java
  4. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

4
designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@ -193,7 +193,9 @@ public class EnvChangeEntrance {
UIManager.getIcon("OptionPane.errorIcon"))); UIManager.getIcon("OptionPane.errorIcon")));
} else { } else {
strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH), result.isVerifyResult()
? new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH)
: result.getText(),
Toolkit.i18nText("Fine-Design_Basic_Error"), Toolkit.i18nText("Fine-Design_Basic_Error"),
ERROR_MESSAGE, ERROR_MESSAGE,
UIManager.getIcon("OptionPane.errorIcon"))); UIManager.getIcon("OptionPane.errorIcon")));

1
designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleBlock.java

@ -96,6 +96,7 @@ public class PredefinedStyleBlock extends JPanel {
private void initPane(boolean supportEdit) { private void initPane(boolean supportEdit) {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
PredefinedStylePreviewPane content = new PredefinedStylePreviewPane(0.387, 0.384); PredefinedStylePreviewPane content = new PredefinedStylePreviewPane(0.387, 0.384);
content.setParent(this);
content.setPreferredSize(new Dimension(200, 180)); content.setPreferredSize(new Dimension(200, 180));
UILabel label = new UILabel(previewObject.getStyleName()); UILabel label = new UILabel(previewObject.getStyleName());
label.setToolTipText(previewObject.getStyleName()); label.setToolTipText(previewObject.getStyleName());

10
designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java

@ -39,6 +39,8 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
private int COLUMN_CHART_WIDTH = 517; private int COLUMN_CHART_WIDTH = 517;
private int COLUMN_CHART_HEIGHT = 300; private int COLUMN_CHART_HEIGHT = 300;
private JPanel parent;
public PredefinedStylePreviewPane() { public PredefinedStylePreviewPane() {
this(1.0, 1.0); this(1.0, 1.0);
} }
@ -53,6 +55,10 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
this.add(this.elementCasePreview); this.add(this.elementCasePreview);
} }
public void setParent(JPanel parent) {
this.parent = parent;
}
private JPanel initChartPreViewPane() { private JPanel initChartPreViewPane() {
columnChartPane = new ChartPreStylePreView(initVanColumnChart()); columnChartPane = new ChartPreStylePreView(initVanColumnChart());
columnChartPane.setPreferredSize(new Dimension(COLUMN_CHART_WIDTH, COLUMN_CHART_HEIGHT)); columnChartPane.setPreferredSize(new Dimension(COLUMN_CHART_WIDTH, COLUMN_CHART_HEIGHT));
@ -142,6 +148,10 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
@Override @Override
public void callback() { public void callback() {
if (parent != null) {
parent.repaint();
} else {
this.repaint(); this.repaint();
} }
}
} }

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -229,7 +229,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
showLabel = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")}); showLabel = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")});
labelDisplayComboBox = new AxisLabelDisplayComboBox(); labelDisplayComboBox = new AxisLabelDisplayComboBox();
labelDisplayPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show"), labelDisplayComboBox); labelDisplayPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show"), labelDisplayComboBox, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
labelDisplayPane.setVisible(showLabelDisplay()); labelDisplayPane.setVisible(showLabelDisplay());
labelTextAttrPane = getChartTextAttrPane(); labelTextAttrPane = getChartTextAttrPane();

Loading…
Cancel
Save