Pull request #11179: REPORT-87576 取色板使用后会让fr卡住。可稳定复现

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

* commit '2e5d636edc2d748f3a4056b2a27249d07beeb7db':
  REPORT-87576 取色板使用后会让fr卡住。可稳定复现

designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@@ -265,34 +265,31 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         int lineStyle = currentLineCombo.getSelectedLineStyle();
         Color lineColor = currentLineColorPane.getSelectObject();
         CellBorderStyle cellBorderStyle = new CellBorderStyle();
+        if (lineColor != null) {
             if (topToggleButton.isSelected()) {
                 cellBorderStyle.setTopColor(lineColor);
             }
-        cellBorderStyle.setTopStyle(topToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-
             if (bottomToggleButton.isSelected()) {
                 cellBorderStyle.setBottomColor(lineColor);
             }
-        cellBorderStyle.setBottomStyle(bottomToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-
             if (leftToggleButton.isSelected()) {
                 cellBorderStyle.setLeftColor(lineColor);
             }
-        cellBorderStyle.setLeftStyle(leftToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-
             if (rightToggleButton.isSelected()) {
                 cellBorderStyle.setRightColor(lineColor);
             }
-        cellBorderStyle.setRightStyle(rightToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-
             if (verticalToggleButton.isSelected()) {
                 cellBorderStyle.setVerticalColor(lineColor);
             }
-        cellBorderStyle.setVerticalStyle(verticalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-
             if (horizontalToggleButton.isSelected()) {
                 cellBorderStyle.setHorizontalColor(lineColor);
             }
+        }
+        cellBorderStyle.setTopStyle(topToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setBottomStyle(bottomToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setLeftStyle(leftToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setRightStyle(rightToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setVerticalStyle(verticalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
         cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
 
         outerToggleButton.setSelected(leftToggleButton.isSelected() && bottomToggleButton.isSelected() && rightToggleButton.isSelected() && topToggleButton.isSelected());