Browse Source

Merge pull request #3535 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '7ab0ee31eb610596719025d3122bdff527da372c':
  CHART-18176  钻取地图标记点默认值修改
  REPORT-46779 报表预览第一行显示不全
feature/10.0
superman 4 years ago
parent
commit
38bc6f6f4d
  1. 8
      designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/style/series/VanChartMapAnchorMarkerPane.java

8
designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java

@ -166,10 +166,10 @@ public class UIModeControlContainer extends JLayeredPane {
} }
// 拖动的距离,为正值表示往下拖动,为负值表示往上拖动 // 拖动的距离,为正值表示往下拖动,为负值表示往上拖动
int deltaY = e.getY(); int deltaY = e.getY();
toolPaneY += deltaY;
if (toolPaneY < 0) { if (toolPaneY < 0) {
toolPaneY = 0; toolPaneY = 0;
} }
toolPaneY += deltaY;
onResize(toolPaneY); onResize(toolPaneY);
refreshContainer(); refreshContainer();
} }
@ -244,7 +244,7 @@ public class UIModeControlContainer extends JLayeredPane {
}; };
protected void onModeChanged() { protected void onModeChanged() {
//do nothing here //do nothing here
} }
/** /**
@ -315,7 +315,7 @@ public class UIModeControlContainer extends JLayeredPane {
addMouseListener(new MouseAdapter() { addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
// do nothing // do nothing
} }
}); });
} }
@ -340,7 +340,7 @@ public class UIModeControlContainer extends JLayeredPane {
@Override @Override
public void layoutContainer(Container parent) { public void layoutContainer(Container parent) {
// do nothing // do nothing
} }
@Override @Override

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

@ -21,7 +21,7 @@ public class VanChartMapAnchorMarkerPane extends BasicBeanPane<VanChartAttrMarke
private UISpinner anchorSize; private UISpinner anchorSize;
public VanChartMapAnchorMarkerPane() { public VanChartMapAnchorMarkerPane() {
anchorSize = new UISpinnerWithPx(0, Double.MAX_VALUE, 0.5, 28); anchorSize = new UISpinnerWithPx(0, Double.MAX_VALUE, 0.5, 22);
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height")), anchorSize} new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height")), anchorSize}

Loading…
Cancel
Save