Browse Source

删除当前按钮时,也要考虑重新更新面板

master
Fangjie Hu 8 years ago
parent
commit
6c2bb1b4b5
  1. 2
      designer/src/com/fr/design/mainframe/ElementCasePane.java
  2. 2
      designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
  3. 7
      designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

2
designer/src/com/fr/design/mainframe/ElementCasePane.java

@ -851,7 +851,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
*/
protected void initInputActionMap() {
InputMap inputMapAncestor = this.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
ActionMap actionMap = this.getActionMap();
ActionMap actionMap = this.getActionMap() ;
// clearReportPage old values.
inputMapAncestor.clear();
actionMap.clear();

2
designer_base/src/com/fr/design/style/color/ColorSelectDialog.java

@ -137,7 +137,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
public static void showDialog(Frame owner,ColorSelectDetailPane pane,Color initialColor,ColorSelectable selectePane){
ColorTracker okListener = new ColorTracker(pane);
ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane);
// dialog.setModal(true);
dialog.setModal(true);
dialog.show();
}

7
designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@ -425,6 +425,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
private void deleteAButton() {
//先重构属性,在重构面板,否则面板在重构过程中,会重新将属性中的切换图表加到indexList中,导致面板无法删除
//记录改变前的plotID
String lastPlotID = editingCollection == null ? StringUtils.EMPTY : editingCollection.getSelectedChart().getPlot().getPlotID();
if (editingCollection != null) {
int count = editingCollection.getChartCount();
for (int i = 0; i < count; i++) {
@ -447,6 +449,11 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
checkoutChange();
relayoutPane();
//重构面板
if (parent != null ){
parent.reLayoutEditPane(lastPlotID, editingCollection);
}
}
private void relayoutPane() {

Loading…
Cancel
Save