Browse Source

Pull request #14811: REPORT-133963 【fr-fbp回归】控件-添加事件-提交条件三个按钮间距不一样大

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit '1a3dfe836466f8995c7ac22a68d8f31047b209e3':
  去除html标签
fbp/merge
Renekton-张世豪 5 months ago
parent
commit
1e3609293c
  1. 2
      designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java
  2. 3
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

2
designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java

@ -59,7 +59,7 @@ public class Commit2DBJavaScriptPane extends FurtherBasicBeanPane<Commit2DBJavaS
btPane.setPreferredSize(createCallbackBtnPanePreferredSize());
addCallbackButton = javaScriptActionPane.createCallButton();
btPane.add(addCallbackButton);
this.add(column(5, cell(cardPane), row(cell(btPane), cell(new UILabel()))).getComponent());
this.add(column(4, cell(cardPane), row(cell(btPane), cell(new UILabel()))).getComponent());
}
protected Dimension createCallbackBtnPanePreferredSize(){

3
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -272,7 +272,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
JPanel conditionPane = this.createConditionPane();
JPanel btPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
btPane.add(column(5,
btPane.add(column(4,
cell(FineUIUtils.wrapComponentWithTitle(conditionPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))),
row(cell(eventPane), cell(new UILabel()))
).getComponent());
@ -320,6 +320,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
jp.setVisible(setJpVisible());
String submitCondition = Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition");
UIButton addSubmitConditionButton = new UIButton(submitCondition);
addSubmitConditionButton.setPreferredSize(createControlBtnPanePreferredSize());
addSubmitConditionButton.setToolTipText(submitCondition);
addSubmitConditionButton.addActionListener(new ActionListener() {
@Override

Loading…
Cancel
Save