Browse Source

拖拽条生成标签步长自定义&控件显示增强tab恢复

fbp/merge
renekton 4 months ago
parent
commit
144da9e50a
  1. 14
      designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java
  2. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java
  3. 2
      designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
  4. 2
      designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

14
designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java

@ -32,19 +32,27 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
}
public UINumberDragPane(double minValue, double maxValue) {
this(minValue, maxValue, 1);
this(minValue, maxValue, 1, (int) maxValue - (int) minValue);
}
public UINumberDragPane(double minValue, double maxValue, int majorTickSpace) {
this(minValue, maxValue, 1, majorTickSpace);
}
public UINumberDragPane(double minValue, double maxValue, double dierta) {
this(minValue, maxValue, dierta, (int) maxValue - (int) minValue);
}
public UINumberDragPane(double minValue, double maxValue, double dierta, int majorTickSpace) {
dragBar = new UISlider((int) minValue, (int) maxValue);
dragBar.setPaintLabels(true);
dragBar.setMajorTickSpacing((int) maxValue - (int) minValue);
dragBar.setMajorTickSpacing(majorTickSpace);
spinner = createUISpinner(minValue, maxValue, dierta);
spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
spinner.setValue(dragBar.getValue());
this.setLayout(new BorderLayout());
this.add(Layouts.row(
cell(dragBar).weight(0.7), flex(0.1), cell(spinner).weight(0.7)
cell(dragBar).weight(0.8), flex(0.1), cell(spinner).weight(0.6)
).getComponent());
dragBar.addChangeListener(e -> {
if (globalNameListener != null && shouldResponseNameListener()) {

4
designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java

@ -14,6 +14,10 @@ public class UINumberDragPaneWithPercent extends UINumberDragPane {
super(minValue, maxValue);
}
public UINumberDragPaneWithPercent(double minValue, double maxValue, int majorTickSpace) {
super(minValue, maxValue, majorTickSpace);
}
public UINumberDragPaneWithPercent(double minValue, double maxValue, double dierta) {
super(minValue, maxValue, dierta);
}

2
designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java

@ -51,8 +51,8 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane);
addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
initializePane();
refreshExtraAdvancedPane();
initializePane();
}
@Override

2
designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@ -63,7 +63,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
private JPanel createSeriesStylePane() {
isFixedWidth = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")});
columnWidth = new UISpinnerWithPx(0,1000,1,0);
seriesGap = new UINumberDragPaneWithPercent(-100, 100);
seriesGap = new UINumberDragPaneWithPercent(-100, 100, 100);
categoryGap = new UINumberDragPaneWithPercent(0, 100);
isFillWithImage = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")});
imagePane = new ImageBackgroundQuickPane(false);

Loading…
Cancel
Save