Merge pull request #10827 in DESIGN/design from bugfix/11.0 to feature/x

* commit '8c23f4e9d627cd5a077af89a407124d790bf0d68':
  REPORT-85774 sqlserver死锁
  REPORT-85902 fix:字段名数据面板多了下拉栏
  REPORT-85880 数据表现与处理-公式-公式编辑区域显示不正常
  REPORT-85880 数据表现与处理-公式-公式编辑区域显示不正常

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -209,7 +209,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
              * @return
              */
             private boolean needUpdate0(Connection origin, Connection connection) {
-                return  !connection.equals(origin) || !isEmbedConnection(connection);
+                return !connection.equals(origin) || !isEmbedConnection(connection);
             }
 
             /**
@@ -257,12 +257,21 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     }
 
     private boolean saveByOldWay(List<String> removedConnNames, List<ConnectionBean> addedOrUpdatedConnections) {
+        final int remaining = ConnectionConfig.getInstance().getRemainingCon(removedConnNames.size(), addedOrUpdatedConnections.size());
         try {
             return Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                 @Override
                 public void run() {
                     removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n));
-                    addedOrUpdatedConnections.forEach(cb -> ConnectionConfig.getInstance().addConnection(cb.getName(), cb.getConnection()));
+                    int innerRemaining = remaining;
+                    for (ConnectionBean cb : addedOrUpdatedConnections) {
+                        if (innerRemaining > 0) {
+                            ConnectionConfig.getInstance().addConnectionWithoutCheck(cb.getName(), cb.getConnection());
+                            innerRemaining--;
+                        } else {
+                            break;
+                        }
+                    }
                 }
             });
         } catch (Exception e) {

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -156,6 +156,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     private DefaultCompletionProvider completionProvider;
     private static final Map<String, String> PARAM_PREFIX_MAP = new HashMap<>();
 
+    public static final int DESCRIPTION_TEXT_AREA_ROW = 16, DESCRIPTION_TEXT_AREA_COLUMN = 27;
+
     public FormulaPane() {
         initComponents();
     }
@@ -1194,8 +1196,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
         private void initDescriptionTextArea() {
             // Description
-            descriptionTextArea = new UITextArea();
+            descriptionTextArea = new UITextArea(DESCRIPTION_TEXT_AREA_ROW,DESCRIPTION_TEXT_AREA_COLUMN);
-
             descriptionTextArea.setBackground(Color.white);
             descriptionTextArea.setLineWrap(true);
             descriptionTextArea.setWrapStyleWord(true);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@@ -161,7 +161,9 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
     public void clearAllBoxList(){
         field.clear();
         seriesDataPane.getTable().clear();
-        seriesDataPane.getTable().updateUI();
+        seriesDataPane.validate();
+        seriesDataPane.repaint();
+        seriesDataPane.revalidate();
     }
 
     private void fireStop() {