Browse Source

Pull request #6262: REPORT-60506 & REPORT-60504 url传参行数为负数分页生效,预定义控件没有默认名称

Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0

* commit '24253b6235ede5a9424a4f49a8996417eb32831b':
  REPORT-60506 & REPORT-60504 url传参行数为负数分页生效,预定义控件没有默认名称
bugfix/11.0
pengda 3 years ago
parent
commit
b75982cb23
  1. 2
      designer-form/src/main/java/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java

2
designer-form/src/main/java/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java

@ -49,6 +49,7 @@ import com.fr.form.ui.MultiFileEditor;
import com.fr.form.ui.NameWidget; import com.fr.form.ui.NameWidget;
import com.fr.form.ui.NoneWidget; import com.fr.form.ui.NoneWidget;
import com.fr.form.ui.NumberEditor; import com.fr.form.ui.NumberEditor;
import com.fr.form.ui.PageFixedRowComboBox;
import com.fr.form.ui.Password; import com.fr.form.ui.Password;
import com.fr.form.ui.Radio; import com.fr.form.ui.Radio;
import com.fr.form.ui.RadioGroup; import com.fr.form.ui.RadioGroup;
@ -98,6 +99,7 @@ public class FormWidgetDefinePaneFactoryBase {
defineMap.put(TextEditor.class, new Appearance(TextFieldEditorDefinePane.class, WidgetConstants.TEXT + "")); defineMap.put(TextEditor.class, new Appearance(TextFieldEditorDefinePane.class, WidgetConstants.TEXT + ""));
defineMap.put(NameWidget.class, new Appearance(UserEditorDefinePane.class, "UserDefine")); defineMap.put(NameWidget.class, new Appearance(UserEditorDefinePane.class, "UserDefine"));
defineMap.put(ComboBox.class, new Appearance(ComboBoxDefinePane.class, WidgetConstants.COMBOBOX + "")); defineMap.put(ComboBox.class, new Appearance(ComboBoxDefinePane.class, WidgetConstants.COMBOBOX + ""));
defineMap.put(PageFixedRowComboBox.class, new Appearance(ComboBoxDefinePane.class, WidgetConstants.COMBOBOX + ""));
defineMap.put(RadioGroup.class, new Appearance(RadioGroupDefinePane.class, WidgetConstants.RADIOGROUP + "")); defineMap.put(RadioGroup.class, new Appearance(RadioGroupDefinePane.class, WidgetConstants.RADIOGROUP + ""));
defineMap.put(CheckBoxGroup.class, new Appearance(CheckBoxGroupDefinePane.class, WidgetConstants.CHECKBOXGROUP + "")); defineMap.put(CheckBoxGroup.class, new Appearance(CheckBoxGroupDefinePane.class, WidgetConstants.CHECKBOXGROUP + ""));

Loading…
Cancel
Save