Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0

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

@@ -53,12 +53,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(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
             FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);

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