Browse Source

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

* commit '6f1d1afb5a4c9de797eff625baa6261aebe7aec2':
  REPORT-38571 【回归】mac下服务器图标变模糊 1. bug原因:原来的图标在高清屏下被放大了,所以显得模糊 2. 修改:将服务器打开和关闭的图片由原来的16*16替换为32*32,并进行了一定的缩小
  REPORT-38917 模板短时间内的保存记录对应多个UUID
  REPORT-38917 模板短时间内的保存记录对应多个UUID
  REPORT-39911 海外版设计器右侧属性栏默认宽度调整、不可拖拽 REPORT-39340 【回归】修复设计器闪退提示存在乱码
  CHART-15730 甘特图的大数据不允许选择里程碑为图片
research/11.0
superman 4 years ago
parent
commit
f948187234
  1. 5
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 2
      designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java
  3. 10
      designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java
  4. 6
      designer-base/src/main/java/com/fr/start/server/ServerTray.java
  5. 8
      designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java
  6. 4
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java

5
designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@ -1472,7 +1472,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
} }
public String getUUID() { public String getUUID() {
return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid; if (StringUtils.isEmpty(uuid)) {
uuid = UUID.randomUUID().toString();
}
return uuid;
} }
public int getActiveKeyStatus() { public int getActiveKeyStatus() {

2
designer-base/src/main/java/com/fr/design/dialog/ErrorDialog.java

@ -35,7 +35,7 @@ public abstract class ErrorDialog extends JDialog implements ActionListener {
JPanel messagePane = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); JPanel messagePane = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
UILabel boldFontLabel = new UILabel(message); UILabel boldFontLabel = new UILabel(message);
UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Send_Report_To_Us")); UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Send_Report_To_Us"));
Font font = FRFont.getInstance("Dialog", Font.BOLD, 20); Font font = FRFont.getInstance(label.getFont().getFontName(), Font.BOLD, 20);
boldFontLabel.setFont(font); boldFontLabel.setFont(font);
messagePane.add(boldFontLabel); messagePane.add(boldFontLabel);
messagePane.add(label); messagePane.add(label);

10
designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java

@ -19,7 +19,7 @@ import java.awt.event.MouseMotionListener;
public class UIEastResizableContainer extends JPanel { public class UIEastResizableContainer extends JPanel {
private static final long serialVersionUID = 1854340560790476907L; private static final long serialVersionUID = 1854340560790476907L;
public static final int MAX_CONTAINER_WIDTH = 500; public static final int MAX_CONTAINER_WIDTH = 340;
public static final int MIN_CONTAINER_WIDTH = 286; public static final int MIN_CONTAINER_WIDTH = 286;
private int containerWidth = 240; private int containerWidth = 240;
@ -266,13 +266,7 @@ public class UIEastResizableContainer extends JPanel {
@Override @Override
public void mouseDragged(MouseEvent e) { public void mouseDragged(MouseEvent e) {
containerWidth = UIEastResizableContainer.this.getWidth() + (UIEastResizableContainer.this.getLocationOnScreen().x - e.getXOnScreen()); // do noting
containerWidth = Math.min(containerWidth, MAX_CONTAINER_WIDTH);
containerWidth = Math.max(containerWidth, MIN_CONTAINER_WIDTH);
refreshContainer();
if ( DesignModeContext.isAuthorityEditing()) {
DesignerContext.getDesignerFrame().doResize();
}
} }
}); });
addMouseListener(new MouseAdapter() { addMouseListener(new MouseAdapter() {

6
designer-base/src/main/java/com/fr/start/server/ServerTray.java

@ -29,9 +29,9 @@ public class ServerTray {
private MenuItem stopMenu; private MenuItem stopMenu;
private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted.png"); private Image trayStartedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStarted@2x.png");
private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped.png"); private Image trayStoppedImage = BaseUtils.readImage("/com/fr/base/images/oem/trayStopped@2x.png");
private ServerManageFrame serverManageFrame; private ServerManageFrame serverManageFrame;
@ -188,4 +188,4 @@ public class ServerTray {
} }
}); });
} }
} }

8
designer-base/src/test/java/com/fr/design/DesignerEnvManagerTest.java

@ -3,6 +3,7 @@ package com.fr.design;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.util.Locale; import java.util.Locale;
import org.junit.Assert;
public class DesignerEnvManagerTest extends TestCase{ public class DesignerEnvManagerTest extends TestCase{
@ -17,4 +18,11 @@ public class DesignerEnvManagerTest extends TestCase{
assertEquals("下边界", envManager.getLanguage(), Locale.SIMPLIFIED_CHINESE); assertEquals("下边界", envManager.getLanguage(), Locale.SIMPLIFIED_CHINESE);
} }
public void testGetUUID() {
DesignerEnvManager envManager = new DesignerEnvManager();
String uuid0 = envManager.getUUID();
String uuid1 = envManager.getUUID();
Assert.assertEquals(uuid0, uuid1);
}
} }

4
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java

@ -59,10 +59,6 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
return ganntStylePane; return ganntStylePane;
} }
protected void checkCompsEnabledWithLarge(Plot plot) {
}
private JPanel createLinkLinePane(){ private JPanel createLinkLinePane(){
lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
colorSelect = new ColorSelectBoxWithOutTransparent(100); colorSelect = new ColorSelectBoxWithOutTransparent(100);

Loading…
Cancel
Save