Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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

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

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);
         UILabel boldFontLabel = new UILabel(message);
         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);
         messagePane.add(boldFontLabel);
         messagePane.add(label);

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 {
     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;
 
     private int containerWidth = 240;
@@ -266,13 +266,7 @@ public class UIEastResizableContainer extends JPanel {
 
                 @Override
                 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() {

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

@@ -29,9 +29,9 @@ public class ServerTray {
 
     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;
 
@@ -188,4 +188,4 @@ public class ServerTray {
             }
         });
     }
-}
+}

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

@@ -3,6 +3,7 @@ package com.fr.design;
 import junit.framework.TestCase;
 
 import java.util.Locale;
+import org.junit.Assert;
 
 public class DesignerEnvManagerTest extends TestCase{
 
@@ -17,4 +18,11 @@ public class DesignerEnvManagerTest extends TestCase{
         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);
+    }
 }

designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java

@@ -82,6 +82,10 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T
         return false;
     }
 
+    protected boolean seriesComboBoxHasNone() {
+        return false;
+    }
+
     public void checkBoxUse(boolean hasUse) {
         nameOrValue.setEnabled(hasUse);
         useFieldValuePane.checkBoxUse(hasUse);
@@ -147,8 +151,7 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends BasicBeanPane<T
 
         private void initComponents() {
 
-            series = new UIComboBox();
+            series = seriesComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
-
             value = valueComboBoxHasNone() ? new UIComboBoxWithNone() : new UIComboBox();
             value.addItemListener(new ItemListener() {
                 @Override

designer-chart/src/main/java/com/fr/extended/chart/ExtendedCustomFieldComboBoxPane.java

@@ -22,6 +22,10 @@ public class ExtendedCustomFieldComboBoxPane extends AbstractCustomFieldComboBox
         return new ExtendedCustomFieldNamePane();
     }
 
+    @Override
+    protected boolean seriesComboBoxHasNone() {
+        return true;
+    }
 
     @Override
     public void populateBean(AbstractDataConfig ob) {

designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java

@@ -41,7 +41,9 @@ public class UIComboBoxWithNone extends UIComboBox {
     public void setSelectedItem(Object anObject) {
         super.setSelectedItem(anObject);
 
-        if (getSelectedIndex() == -1) {//找不到的都选中无。中文的无 英文下是none。
+        //找不到的都选中无。中文的无 英文下是none。
+        //改正：找不到的且anObject不是null的 全部选中无。
+        if (getSelectedIndex() == -1 && anObject != null) {
             super.setSelectedItem(getDefaultLocaleString());
         }
     }

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;
     }
 
-    protected void checkCompsEnabledWithLarge(Plot plot) {
-
-    }
-
     private JPanel createLinkLinePane(){
         lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         colorSelect = new ColorSelectBoxWithOutTransparent(100);