Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

REPORT-3348 可扩展性触发保存

master
yaoh.wu 7 years ago
parent
fb6f0d20c4
commit
2e96d8303c
1 changed files with 91 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 140
      designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

140
designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
Unescape View File

@ -165,6 +165,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
paneList.add(cellDSColumnAdvancedPane); paneList.add(cellDSColumnAdvancedPane);
} }
/** /**
* 单元格元素 数据列 高级设置内容面板 * 单元格元素 数据列 高级设置内容面板
* *
@ -289,9 +290,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
//自定义值显示 //自定义值显示
private CustomValuePane valuePane; private CustomValuePane valuePane;
//横向可扩展性 //横向可扩展性
private UICheckBox horizontalExtendableCheckBox; private UICheckBox heCheckBox;
//纵向可扩展性 //纵向可扩展性
private UICheckBox verticalExtendableCheckBox; private UICheckBox veCheckBox;
//补充空白数据 //补充空白数据
private UICheckBox useMultiplyNumCheckBox; private UICheckBox useMultiplyNumCheckBox;
//补充空白数据书目输入框 //补充空白数据书目输入框
@ -322,32 +323,15 @@ public class CellDSColumnEditor extends CellQuickEditor {
sortPane.update(cellElement); sortPane.update(cellElement);
valuePane.update(cellElement); valuePane.update(cellElement);
filterPane.update(cellElement); filterPane.update(cellElement);
CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr(); //更新单元格扩展属性
if (cellExpandAttr == null) { updateExtendConfig();
cellExpandAttr = new CellExpandAttr();
cellElement.setCellExpandAttr(cellExpandAttr); //更新补充空白设置
} updateMultipleConfig();
if (horizontalExtendableCheckBox.isSelected()) {
if (verticalExtendableCheckBox.isSelected()) {
cellExpandAttr.setExtendable(CellExpandAttr.Both_EXTENDABLE);
} else {
cellExpandAttr.setExtendable(CellExpandAttr.Horizontal_EXTENDABLE);
}
} else {
if (verticalExtendableCheckBox.isSelected()) {
cellExpandAttr.setExtendable(CellExpandAttr.Vertical_EXTENDABLE);
} else {
cellExpandAttr.setExtendable(CellExpandAttr.None_EXTENDABLE);
}
}
if (this.useMultiplyNumCheckBox.isSelected()) {
cellExpandAttr.setMultipleNumber((int) multiNumSpinner.getValue());
} else {
cellExpandAttr.setMultipleNumber(-1);
}
} }
} }
@SuppressWarnings("Duplicates")
@Override @Override
public void populate() { public void populate() {
if (cellElement != null) { if (cellElement != null) {
@ -362,20 +346,20 @@ public class CellDSColumnEditor extends CellQuickEditor {
// extendable // extendable
switch (cellExpandAttr.getExtendable()) { switch (cellExpandAttr.getExtendable()) {
case CellExpandAttr.Both_EXTENDABLE: case CellExpandAttr.Both_EXTENDABLE:
horizontalExtendableCheckBox.setSelected(true); heCheckBox.setSelected(true);
verticalExtendableCheckBox.setSelected(true); veCheckBox.setSelected(true);
break; break;
case CellExpandAttr.Vertical_EXTENDABLE: case CellExpandAttr.Vertical_EXTENDABLE:
horizontalExtendableCheckBox.setSelected(false); heCheckBox.setSelected(false);
verticalExtendableCheckBox.setSelected(true); veCheckBox.setSelected(true);
break; break;
case CellExpandAttr.Horizontal_EXTENDABLE: case CellExpandAttr.Horizontal_EXTENDABLE:
horizontalExtendableCheckBox.setSelected(true); heCheckBox.setSelected(true);
verticalExtendableCheckBox.setSelected(false); veCheckBox.setSelected(false);
break; break;
default: { default: {
horizontalExtendableCheckBox.setSelected(false); heCheckBox.setSelected(false);
verticalExtendableCheckBox.setSelected(false); veCheckBox.setSelected(false);
} }
} }
if (cellExpandAttr.getMultipleNumber() == -1) { if (cellExpandAttr.getMultipleNumber() == -1) {
@ -388,6 +372,44 @@ public class CellDSColumnEditor extends CellQuickEditor {
} }
} }
/**
* 更新单元格扩展属性
*/
@SuppressWarnings("Duplicates")
private void updateExtendConfig() {
CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr();
if (cellExpandAttr == null) {
cellExpandAttr = new CellExpandAttr();
cellElement.setCellExpandAttr(cellExpandAttr);
}
if (heCheckBox.isSelected()) {
if (veCheckBox.isSelected()) {
cellExpandAttr.setExtendable(CellExpandAttr.Both_EXTENDABLE);
} else {
cellExpandAttr.setExtendable(CellExpandAttr.Horizontal_EXTENDABLE);
}
} else {
if (veCheckBox.isSelected()) {
cellExpandAttr.setExtendable(CellExpandAttr.Vertical_EXTENDABLE);
} else {
cellExpandAttr.setExtendable(CellExpandAttr.None_EXTENDABLE);
}
}
}
/**
* 更新补充空白处的配置
*/
private void updateMultipleConfig() {
CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr();
if (this.useMultiplyNumCheckBox.isSelected()) {
cellExpandAttr.setMultipleNumber((int) multiNumSpinner.getValue());
} else {
cellExpandAttr.setMultipleNumber(-1);
}
}
/** /**
* 创建内容 * 创建内容
*/ */
@ -438,23 +460,43 @@ public class CellDSColumnEditor extends CellQuickEditor {
}); });
//可扩展性 //可扩展性
JPanel extendableDirectionPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel extendableDirectionPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
extendableDirectionPane.add(horizontalExtendableCheckBox = new UICheckBox(Inter.getLocText("ExpandD-Horizontal_Extendable"))); extendableDirectionPane.add(heCheckBox = new UICheckBox(Inter.getLocText("ExpandD-Horizontal_Extendable")));
extendableDirectionPane.add(verticalExtendableCheckBox = new UICheckBox(Inter.getLocText("ExpandD-Vertical_Extendable"))); extendableDirectionPane.add(veCheckBox = new UICheckBox(Inter.getLocText("ExpandD-Vertical_Extendable")));
heCheckBox.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
cellDSColumnAdvancedPane.updateExtendConfig();
fireTargetModified();
}
});
veCheckBox.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
cellDSColumnAdvancedPane.updateExtendConfig();
fireTargetModified();
}
});
//补充空白数据 //补充空白数据
JPanel multiNumPane = new JPanel(); JPanel multiNumPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
useMultiplyNumCheckBox = new UICheckBox(Inter.getLocText("Column_Multiple")); useMultiplyNumCheckBox = new UICheckBox(Inter.getLocText("Column_Multiple"));
multiNumPane.add(useMultiplyNumCheckBox); multiNumPane.add(useMultiplyNumCheckBox);
multiNumPane.add(new UILabel(INSET_TEXT)); multiNumPane.add(new UILabel(INSET_TEXT));
multiNumSpinner = new UISpinner(1, 10000, 1, 1); multiNumSpinner = new UISpinner(1, 10000, 1, 1);
multiNumPane.add(multiNumSpinner); multiNumPane.add(multiNumSpinner);
useMultiplyNumCheckBox.addActionListener(new ActionListener() { useMultiplyNumCheckBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
checkButtonEnabled(); checkButtonEnabled();
cellDSColumnAdvancedPane.updateMultipleConfig();
fireTargetModified();
}
});
multiNumSpinner.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
cellDSColumnAdvancedPane.updateMultipleConfig();
fireTargetModified();
} }
}); });
@ -487,7 +529,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
* @see com.fr.design.expand.SortExpandAttrPane * @see com.fr.design.expand.SortExpandAttrPane
* @see DSColumnAdvancedPane.SortPane * @see DSColumnAdvancedPane.SortPane
*/ */
protected class ResultSetSortConfigPane extends JPanel { public class ResultSetSortConfigPane extends JPanel {
//面板 //面板
private UIButtonGroup sortTypePane; private UIButtonGroup sortTypePane;
private TinyFormulaPane tinyFormulaPane; private TinyFormulaPane tinyFormulaPane;
@ -597,7 +639,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
* *
* @see DSColumnAdvancedPane.SelectCountPane * @see DSColumnAdvancedPane.SelectCountPane
*/ */
protected class ResultSetFilterConfigPane extends JPanel { public class ResultSetFilterConfigPane extends JPanel {
private UIComboBox rsComboBox; private UIComboBox rsComboBox;
private JPanel setCardPane; private JPanel setCardPane;
@ -626,26 +668,26 @@ public class CellDSColumnEditor extends CellQuickEditor {
if (selectIndex == 1) { if (selectIndex == 1) {
setCardPaneLayout.show(setCardPane, FilterType.TOP.name()); setCardPaneLayout.show(setCardPane, FilterType.TOP.name());
tipCardPaneLayout.show(tipCardPane, FilterType.TOP.name()); tipCardPaneLayout.show(tipCardPane, FilterType.TOP.name());
//隐藏tip //todo 隐藏tip
} else if (selectIndex == 2) { } else if (selectIndex == 2) {
setCardPaneLayout.show(setCardPane, FilterType.BOTTOM.name()); setCardPaneLayout.show(setCardPane, FilterType.BOTTOM.name());
tipCardPaneLayout.show(tipCardPane, FilterType.BOTTOM.name()); tipCardPaneLayout.show(tipCardPane, FilterType.BOTTOM.name());
//隐藏tip //todo 隐藏tip
} else if (selectIndex == 3) { } else if (selectIndex == 3) {
setCardPaneLayout.show(setCardPane, FilterType.ODD.name()); setCardPaneLayout.show(setCardPane, FilterType.ODD.name());
tipCardPaneLayout.show(tipCardPane, FilterType.ODD.name()); tipCardPaneLayout.show(tipCardPane, FilterType.ODD.name());
//隐藏set //todo 隐藏set
} else if (selectIndex == 4) { } else if (selectIndex == 4) {
setCardPaneLayout.show(setCardPane, FilterType.EVEN.name()); setCardPaneLayout.show(setCardPane, FilterType.EVEN.name());
tipCardPaneLayout.show(tipCardPane, FilterType.EVEN.name()); tipCardPaneLayout.show(tipCardPane, FilterType.EVEN.name());
//隐藏set //todo 隐藏set
} else if (selectIndex == 5) { } else if (selectIndex == 5) {
setCardPaneLayout.show(setCardPane, FilterType.SPECIFY.name()); setCardPaneLayout.show(setCardPane, FilterType.SPECIFY.name());
tipCardPaneLayout.show(tipCardPane, FilterType.SPECIFY.name()); tipCardPaneLayout.show(tipCardPane, FilterType.SPECIFY.name());
} else { } else {
setCardPaneLayout.show(setCardPane, FilterType.UNDEFINE.name()); setCardPaneLayout.show(setCardPane, FilterType.UNDEFINE.name());
tipCardPaneLayout.show(tipCardPane, FilterType.UNDEFINE.name()); tipCardPaneLayout.show(tipCardPane, FilterType.UNDEFINE.name());
//隐藏set和tip //todo 隐藏set和tip
} }
} }
@ -769,7 +811,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
* *
* @see DSColumnAdvancedPane.JFormulaField * @see DSColumnAdvancedPane.JFormulaField
*/ */
private class JFormulaField extends JPanel { public class JFormulaField extends JPanel {
private CellElement cellElement; private CellElement cellElement;
private UITextField formulaTextField; private UITextField formulaTextField;
private String defaultValue; private String defaultValue;
@ -858,7 +900,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
* *
* @see DSColumnAdvancedPane.ValuePane * @see DSColumnAdvancedPane.ValuePane
*/ */
private class CustomValuePane extends JPanel { public class CustomValuePane extends JPanel {
private JFormulaField formulaField; private JFormulaField formulaField;
public CustomValuePane() { public CustomValuePane() {

Write Preview
Loading…
Cancel
Save