Browse Source

Merge pull request #13822 in DESIGN/design from release/11.0 to bugfix/11.0

* commit 'b225f036beca60ff020ba2c1e189aa1401298d45':
  REPORT-116550 控件增强显示,设置圆角属性后无效,圆角设置框手动输入数字后,需要按回车才能保存 【问题原因】交互问题。之前使用的UIBoundSpinner,切换面板失焦时不会触发修改 【改动思路】产品确认修改交互。改为UISpinner组件,失焦时触发修改
bugfix/11.0
superman 8 months ago
parent
commit
4151b2a76e
  1. 6
      designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

6
designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@ -14,6 +14,7 @@ import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.icombobox.LineComboBox;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.style.FRFontPane; import com.fr.design.gui.style.FRFontPane;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
@ -22,7 +23,6 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.style.color.NewColorSelectBox; import com.fr.design.style.color.NewColorSelectBox;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.design.widget.ui.designer.component.UIBoundSpinner;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
@ -72,7 +72,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
*/ */
protected NewColorSelectBox borderColorSelectBox; protected NewColorSelectBox borderColorSelectBox;
// 圆角边框 // 圆角边框
protected UIBoundSpinner borderRadiusSpinner; protected UISpinner borderRadiusSpinner;
// 字体详细设置 // 字体详细设置
protected FRFontPane frFontPane; protected FRFontPane frFontPane;
// 按钮背景设置 // 按钮背景设置
@ -358,7 +358,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
private void initBorderPane() { private void initBorderPane() {
lineComboBox = new LineComboBox(WidgetThemeDisplayConstants.BORDER_LINE_STYLE_ARRAY); lineComboBox = new LineComboBox(WidgetThemeDisplayConstants.BORDER_LINE_STYLE_ARRAY);
borderColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true); borderColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
borderRadiusSpinner = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
lineComboBox.addItemListener(e -> borderColorSelectBox.setVisible(!Integer.valueOf(0).equals(e.getItem()))); lineComboBox.addItemListener(e -> borderColorSelectBox.setVisible(!Integer.valueOf(0).equals(e.getItem())));
} }
} }

Loading…
Cancel
Save