Merge remote-tracking branch 'origin/fbp/release' into fbp/release

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@@ -192,7 +192,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
         if (StringUtils.isEmpty(name)) {
             return false;
         }
-        Connection connection = ConnectionInfoBeanHelper.createConnection(ConnectionRepository.getInstance().getByName(connectionTableProcedurePane.getSelectedDatabaseConnnectonName()));
+        Connection connection = ConnectionInfoBeanHelper.createConnection(ConnectionRepository.getInstance().getByName(name));
         return connection != null && ArrayUtils.contains(DRIVERS, connection.getDriver());
     }
 

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(){

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