Browse Source

Merge pull request #3415 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '956cbf9a8f27cc77c89e5a0d4b618a123e908d0a':
  CHART-17941 调整面板
  REPORT-46993 fix 无用import
  REPORT-46993 【10.0.13冒烟】设计器启动之后的第一张模板,参数面板展示不正常
bugfix/10.0
superman 4 years ago
parent
commit
fdd13c1dab
  1. 2
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java

2
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -357,6 +357,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
removeCenterPane(); removeCenterPane();
// 加入新的 // 加入新的
addCenterPane(); addCenterPane();
refreshToolArea();
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java

@ -10,6 +10,7 @@ import com.fr.plugin.chart.base.VanChartAttrMarker;
import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.plugin.chart.marker.type.MarkerType;
import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
@ -35,6 +36,7 @@ public class VanChartMapAnchorMarkerPane extends BasicBeanPane<VanChartAttrMarke
content.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER); content.setBorder(TableLayout4VanChartHelper.SECOND_EDIT_AREA_BORDER);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
this.add(content, BorderLayout.CENTER); this.add(content, BorderLayout.CENTER);
} }

Loading…
Cancel
Save