Browse Source

Merge pull request #3117 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'aa585ca13dbb25d3bf269a9ba41431339090b296':
  REPORT-45402 插件管理-安装已经本地已经安装低版本的插件,点否不更新,还是会更新已安装的插件
  CHART-17231 默认不选中任何项
bugfix/10.0
superman 4 years ago
parent
commit
a74918ec46
  1. 5
      designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
  2. 6
      designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java

5
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);

6
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

Loading…
Cancel
Save