|
|
|
@ -217,7 +217,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
|
|
|
|
|
|
|
|
|
|
double[] rowSize = {P}, columnSize = {P, F}; |
|
|
|
|
UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Filter_Conditions")); |
|
|
|
|
uiLabel.setPreferredSize(new Dimension(60, 20)); |
|
|
|
|
uiLabel.setPreferredSize(LABEL_DIMENSION); |
|
|
|
|
UIButton uiButton = new UIButton(); |
|
|
|
|
if (tc != null) { |
|
|
|
|
//第一次初始化时tc为空,会引发NullPointerException
|
|
|
|
@ -481,14 +481,13 @@ public class CellDSColumnEditor extends CellQuickEditor {
|
|
|
|
|
multiNumSpinner = new UISpinner(1, 10000, 1, 1); |
|
|
|
|
//数据倍数
|
|
|
|
|
UILabel multipleLabel = new UILabel(Inter.getLocText("Column_Multiple")); |
|
|
|
|
multipleLabel.setPreferredSize(new Dimension(60, 20)); |
|
|
|
|
multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ |
|
|
|
|
new Component[]{ |
|
|
|
|
multipleLabel, multiNumSpinner |
|
|
|
|
} |
|
|
|
|
}, new double[]{P}, new double[]{P, F}, HGAP, VGAP |
|
|
|
|
); |
|
|
|
|
multiPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); |
|
|
|
|
multiPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0)); |
|
|
|
|
multiNumPane.add(multiPane); |
|
|
|
|
useMultiplyNumCheckBox.addActionListener(new ActionListener() { |
|
|
|
|
public void actionPerformed(ActionEvent e) { |
|
|
|
@ -563,7 +562,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
|
|
|
|
|
centerPane.add(new JPanel(), "none"); |
|
|
|
|
centerPane.add(formulaField, "content"); |
|
|
|
|
UILabel sortLabel = new UILabel(Inter.getLocText("Sort-Sort_Order")); |
|
|
|
|
sortLabel.setPreferredSize(new Dimension(60, 20)); |
|
|
|
|
sortLabel.setPreferredSize(LABEL_DIMENSION); |
|
|
|
|
sortTypePane.addChangeListener(new ChangeListener() { |
|
|
|
|
@Override |
|
|
|
|
public void stateChanged(ChangeEvent e) { |
|
|
|
@ -982,7 +981,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
|
|
|
|
|
public CustomValuePane() { |
|
|
|
|
this.setLayout(new BorderLayout()); |
|
|
|
|
UILabel customValueLabel = new UILabel(Inter.getLocText("FR-Designer_Display_Value")); |
|
|
|
|
customValueLabel.setPreferredSize(new Dimension(60, 20)); |
|
|
|
|
customValueLabel.setPreferredSize(LABEL_DIMENSION); |
|
|
|
|
formulaField = new JFormulaField(DEFAULT_VALUE); |
|
|
|
|
this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ |
|
|
|
|
new Component[]{customValueLabel, formulaField}, |
|
|
|
@ -994,14 +993,13 @@ public class CellDSColumnEditor extends CellQuickEditor {
|
|
|
|
|
Object value = cellElement.getValue(); |
|
|
|
|
if (value != null && value instanceof DSColumn) { |
|
|
|
|
DSColumn dSColumn = (DSColumn) value; |
|
|
|
|
|
|
|
|
|
//formula
|
|
|
|
|
String valueFormula = dSColumn.getResult(); |
|
|
|
|
if (valueFormula == null) { |
|
|
|
|
valueFormula = DEFAULT_VALUE; |
|
|
|
|
if (valueFormula != null) { |
|
|
|
|
formulaField.populate(valueFormula); |
|
|
|
|
} |
|
|
|
|
formulaField.populateElement(cellElement); |
|
|
|
|
formulaField.populate(valueFormula); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|