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

* commit 'a74918ec4602666782232f57d7fd229fdb91f068':
  REPORT-45402 插件管理-安装已经本地已经安装低版本的插件，点否不更新，还是会更新已安装的插件
  CHART-17231 默认不选中任何项
  REPORT-45015 条件属性-数字控件没有错误提示

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -51,12 +51,13 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
                     FineJOptionPane.OPTION_YES_NO_CANCEL,
                     null
             );
-            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+            if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+                jsCallback.execute("success");
                 return;
             }
             PluginMarker pluginMarker = result.getCurrentTask().getMarker();
             PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback);
-        }else {
+        } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
             FineJOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -150,6 +150,7 @@ public class NumberEditorValidatePane extends JPanel {
         setMaxListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                errorMsgTextFieldPane.setVisible(setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected());
                 if (setMaxValueCheckBox.isSelected()) {
                     maxValueSpinner.setEnabled(true);
                     Double value = (double) 0;
@@ -171,6 +172,7 @@ public class NumberEditorValidatePane extends JPanel {
         setMinListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                errorMsgTextFieldPane.setVisible(setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected());
                 if (setMinValueCheckBox.isSelected()) {
                     minValueSpinner.setEnabled(true);
                     Double value = (double) 0;

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

@@ -23,7 +23,11 @@ public class UIComboBoxWithNone extends UIComboBox {
     }
 
     protected void setDefaultSelectedItem() {
-        setSelectedItem(StringUtils.EMPTY);
+        // JComboBox.setSelectedItem(o)
+        // if(o!=null)寻找o对应的下拉选项 如果找不到 还是选中之前选中的
+        // 所以空字符串 不是选中空 是选中上次选中的
+        // 所以这边 可以写setSelectedItem(null) or setSelectedIndex(-1)
+        setSelectedIndex(-1);
     }
 
     @Override