diff --git a/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java index b26da1eee5..87148bdf4c 100644 --- a/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/com/fr/design/style/color/ColorSelectDialog.java @@ -85,6 +85,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ this.add(pane,BorderLayout.NORTH); this.setBasicDialogSize(545,500); + this.setResizable(false); JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); diff --git a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index f3610da865..caf766df37 100644 --- a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -19,6 +19,7 @@ import javax.swing.border.Border; import javax.swing.border.LineBorder; import javax.swing.border.TitledBorder; import java.awt.*; +import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -93,7 +94,16 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane extends Tar * 因为这边判断selection是一个selection,所以不会触发fireSelectionChanged */ public void setSelection(Selection selection) { - try { - //旧选中内容编辑器释放模板对象 - this.getCurrentEditor().release(); - } catch (UnsupportedOperationException e) { - FRContext.getLogger().info("Nothing to release"); - } - if (!ComparatorUtils.equals(this.selection, selection) || !ComparatorUtils.equals(EastRegionContainerPane.getInstance().getCellAttrPane(), CellElementPropertyPane.getInstance())) { + try { + //旧选中内容编辑器释放模板对象 + this.getCurrentEditor().release(); + } catch (UnsupportedOperationException e) { + FRContext.getLogger().info("Nothing to release"); + } this.selection = selection; fireSelectionChanged(); }