Browse Source

Pull request #1653: REPORT-27207 表单填报,入库设置三个类型,设置后,显示问题

Merge in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0

* commit 'e580d48e62967b86fb0fab0719b3be1d839817a6':
  REPORT-27207 表单填报,入库设置三个类型,设置后,显示问题
feature/big-screen
zack 5 years ago
parent
commit
8ef579d2a7
  1. 6
      designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java

6
designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java

@ -4,6 +4,7 @@ import com.fr.design.DesignModelAdapter;
import com.fr.design.gui.icombobox.FilterComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.StringUtils;
import com.fr.stable.js.WidgetName;
import javax.swing.JList;
@ -19,6 +20,8 @@ import java.awt.Component;
* @since 2012-3-29下午6:04:37
*/
public class WidgetNameEditor extends Editor<WidgetName> {
static final WidgetName EMPTY_WIDGET_NAME = new WidgetName(StringUtils.EMPTY);
private FilterComboBox<WidgetName> comb;
@ -79,7 +82,8 @@ public class WidgetNameEditor extends Editor<WidgetName> {
@Override
public WidgetName getValue() {
return (WidgetName) comb.getSelectedItem();
WidgetName widgetName = (WidgetName) comb.getSelectedItem();
return widgetName == null ? EMPTY_WIDGET_NAME : widgetName;
}
@Override

Loading…
Cancel
Save