Browse Source

Merge pull request #689 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'f097a854c9d465693d082090c7bfc28965bbc8c5':
  REPORT-13528 最新的jar,图片超链不能取到组件
bugfix/10.0
Hades 6 years ago
parent
commit
e5133eaee5
  1. 8
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java

8
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java

@ -110,12 +110,14 @@ public class FormHyperlinkNorthPane extends BasicBeanPane<FormHyperlinkProvider>
}
String editorName = formHyperlink.getRelateEditorName();
//防止初始的时候有空白选项
if (editorName == null) {
return;
String[] formHyperlinkEditNames = getFormHyperlinkEditNames();
if (editorName == null && formHyperlinkEditNames.length > 0) {
editorName = formHyperlinkEditNames[0];
formHyperlink.setRelateEditorName(editorName);
}
if (targetFrameComboBox != null) {
//noinspection unchecked
targetFrameComboBox.setModel(new DefaultComboBoxModel(getFormHyperlinkEditNames()));
targetFrameComboBox.setModel(new DefaultComboBoxModel(formHyperlinkEditNames));
targetFrameComboBox.setSelectedItem(editorName);
}
}

Loading…
Cancel
Save