Browse Source

CHART-11286 数据筛选界面调整

persist/11.0
白岳 5 years ago
parent
commit
2931612965
  1. 9
      designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java
  2. 9
      designer-chart/src/main/java/com/fr/design/chartx/component/CategorySeriesFilterPane.java

9
designer-chart/src/main/java/com/fr/design/chartx/component/AbstractSingleFilterPane.java

@ -20,6 +20,7 @@ import javax.swing.event.ChangeListener;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Label;
/**
* Created by shine on 2019/07/18.
@ -76,7 +77,7 @@ public abstract class AbstractSingleFilterPane extends AbstractChartTabPane<Data
JPanel panel1 = new JPanel(new BorderLayout());
JPanel panel2 = new JPanel(new BorderLayout());
panel1.add(useTopCheckBox, BorderLayout.NORTH);
topNumTextField = new UITextField();
topNumTextField = new UITextField("0");
UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
mergeOtherCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
mergeOtherCheckBox.setSelected(true);
@ -108,7 +109,11 @@ public abstract class AbstractSingleFilterPane extends AbstractChartTabPane<Data
fire();
}
};
JPanel presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"), present);
JPanel presentPane = new JPanel(new BorderLayout(30, 0));
presentPane.add(new Label(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present")), BorderLayout.WEST);
presentPane.add(present,BorderLayout.CENTER);
presentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
panel2.add(presentPane, BorderLayout.SOUTH);
double[] column = {f};

9
designer-chart/src/main/java/com/fr/design/chartx/component/CategorySeriesFilterPane.java

@ -8,9 +8,10 @@ import com.fr.design.i18n.Toolkit;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.map.designer.VanChartGroupPane;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.util.List;
import java.awt.BorderLayout;
/**
* @author shine
@ -36,14 +37,14 @@ public class CategorySeriesFilterPane extends JPanel {
}
};
JPanel groupPane = new VanChartGroupPane(new String[]{seriesFilterPane.title4PopupWindow(), categoryFilterPane.title4PopupWindow()}
, new JPanel[]{seriesFilterPane, categoryFilterPane}) {
JPanel groupPane = new VanChartGroupPane(new String[]{categoryFilterPane.title4PopupWindow(), seriesFilterPane.title4PopupWindow()}
, new JPanel[]{categoryFilterPane, seriesFilterPane}) {
};
JPanel contentPane = new JPanel(new BorderLayout());
contentPane.add(new JPanel(), BorderLayout.NORTH);
contentPane.add(groupPane, BorderLayout.CENTER);
groupPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15));
this.setLayout(new BorderLayout());
this.add(TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), contentPane), BorderLayout.CENTER);
}

Loading…
Cancel
Save