Browse Source

Merge pull request #8087 in DESIGN/design from final/11.0 to persist/11.0

* commit 'c6317d30811868472d164f361dba8abbfb982870':
  CHART-23035 仪表盘轴标签样式修改均不生效
  CHART-23035 仪表盘轴标签样式修改均不生效
  KERNEL-9928 重构水印 1.水印接口规范
  REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
  REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读
fix-lag
superman 3 years ago
parent
commit
d14435e09c
  1. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
  2. 22
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java
  3. 4
      designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

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

@ -569,7 +569,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
}
//标签
private void populateLabel(VanChartAxis axis) {
protected void populateLabel(VanChartAxis axis) {
if (showLabel != null) {
showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1);
}
@ -813,7 +813,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
}
//标签
private void updateLabel(VanChartAxis axis) {
protected void updateLabel(VanChartAxis axis) {
if (showLabel != null) {
axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0);
}

22
designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java

@ -186,25 +186,43 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
public void populateBean(VanChartAxis axis) {
VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
labelTextAttrPane.populate(axis.getTextAttr());
super.populateBean(gaugeAxis);
}
@Override
protected void populateLabel(VanChartAxis axis) {
VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
if (showLabel != null) {
showLabel.setSelectedIndex(axis.isShowAxisLabel() ? 0 : 1);
}
if (mainTickColor != null) {
mainTickColor.setSelectObject(gaugeAxis.getMainTickColor());
}
if (secTickColor != null) {
secTickColor.setSelectObject(gaugeAxis.getSecTickColor());
}
super.populateBean(gaugeAxis);
}
public void updateBean(VanChartAxis axis) {
VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
TextAttr textAttr = axis.getTextAttr();
labelTextAttrPane.update(textAttr);
super.updateBean(gaugeAxis);
}
@Override
protected void updateLabel(VanChartAxis axis) {
VanChartGaugeAxis gaugeAxis = (VanChartGaugeAxis) axis;
if (showLabel != null) {
axis.setShowAxisLabel(showLabel.getSelectedIndex() == 0);
}
if (mainTickColor != null) {
gaugeAxis.setMainTickColor(mainTickColor.getSelectObject());
}
if (secTickColor != null) {
gaugeAxis.setSecTickColor(secTickColor.getSelectObject());
}
super.updateBean(gaugeAxis);
}
}

4
designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

@ -1,8 +1,6 @@
package com.fr.design.actions.report;
import com.fr.base.iofile.attr.WatermarkAttr;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.JWorkBookAction;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.DesignerContext;
@ -39,7 +37,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
return;
}
final WorkBook wbTpl = jwb.getTarget();
WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplate(wbTpl);
WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplateAndGlobal(wbTpl);
final WatermarkSettingPane watermarkPane = new WatermarkSettingPane();
watermarkPane.populate(watermark);
watermarkPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {

Loading…
Cancel
Save