Pull request #3803: REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样

Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0

* commit '6ce46d57e2132851d49dec173c26bdfdbbf58450':
  REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样

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

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

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.cell.settingpane;
 import com.fr.base.Style;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.cell.settingpane.style.StylePane;
+import com.fr.design.style.BorderUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 import com.fr.report.cell.DefaultTemplateCellElement;
@@ -67,6 +68,7 @@ public class CellStylePane extends AbstractCellAttrPane {
 
     @Override
     public void updateBeans() {
+        Object[] selectionCellBorderObjects = BorderUtils.createCellBorderObject(elementCasePane);
         if (stylePane.getSelectedIndex() == 1) {
             Style s = stylePane.updateBean();
             TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
@@ -110,7 +112,8 @@ public class CellStylePane extends AbstractCellAttrPane {
                     }
                 }
             }
-            stylePane.updateBorder();// border必须特别处理
+            // border必须特别处理
+            stylePane.updateBorder(selectionCellBorderObjects);
         }
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java

@@ -136,8 +136,8 @@ public class CustomStylePane extends MultiTabPane<Style> {
     /**
      *
      */
-    public void updateBorder() {
-        BorderUtils.update(reportPane, ((BorderPane) paneList.get(ONE_INDEX)).update());
+    public void updateBorder(Object[] selectionCellBorderObjects) {
+        BorderUtils.update(reportPane, selectionCellBorderObjects, ((BorderPane) paneList.get(ONE_INDEX)).update());
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java

@@ -38,10 +38,9 @@ public class StylePane extends UIComboBoxPane<Style> {
 		customStylePane.addTabChangeListener(changeListener);
 	}
 
-
-	public void updateBorder() {
+	public void updateBorder(Object[] selectionCellBorderObjects) {
 		if (getSelectedIndex() == 0 && customStylePane.isBorderPaneSelected()) {
-			customStylePane.updateBorder();
+			customStylePane.updateBorder(selectionCellBorderObjects);
 		}
 	}
 

designer-realize/src/main/java/com/fr/design/style/BorderUtils.java

@@ -464,8 +464,13 @@ public abstract class BorderUtils {
      * changed, need to support undo/redo
      */
     public static boolean update(ElementCasePane reportPane, CellBorderStyle newCellBorderStyle) {
+        Object[] selectionCellBorderObjects = createCellBorderObject(reportPane);
+        return update(reportPane, selectionCellBorderObjects, newCellBorderStyle);
+    }
+
+    public static boolean update(ElementCasePane reportPane, Object[] selectionCellBorderObjects, CellBorderStyle newCellBorderStyle) {
         boolean isBorderColorStyleChanged = false;
-        Object[] fourObjectArray = createCellBorderObject(reportPane);
+        Object[] fourObjectArray = selectionCellBorderObjects;
         if (fourObjectArray == null || fourObjectArray.length < NUMBER) {
             return false;
         }
@@ -526,44 +531,60 @@ public abstract class BorderUtils {
             if (cellBorderStyle.getLeftStyle() != newCellBorderStyle.getLeftStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getLeftColor(), newCellBorderStyle.getLeftColor())) {
                 style = style.deriveBorderLeft(newCellBorderStyle.getLeftStyle(), newCellBorderStyle.getLeftColor());
+            } else {
+                style = style.deriveBorderLeft(cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor());
             }
         } else {
             if (cellBorderStyle.getVerticalStyle() != newCellBorderStyle.getVerticalStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getVerticalColor(), newCellBorderStyle.getVerticalColor())) {
                 style = style.deriveBorderLeft(newCellBorderStyle.getVerticalStyle(), newCellBorderStyle.getVerticalColor());
+            } else {
+                style = style.deriveBorderLeft(cellBorderStyle.getVerticalStyle(), cellBorderStyle.getVerticalColor());
             }
         }
         if (tmpCellElement.getColumn() + tmpCellElement.getColumnSpan() == column + columnSpan) {
             if (cellBorderStyle.getRightStyle() != newCellBorderStyle.getRightStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getRightColor(), newCellBorderStyle.getRightColor())) {
                 style = style.deriveBorderRight(newCellBorderStyle.getRightStyle(), newCellBorderStyle.getRightColor());
+            } else {
+                style = style.deriveBorderRight(cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
             }
         } else {
             if (cellBorderStyle.getVerticalStyle() != newCellBorderStyle.getVerticalStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getVerticalColor(), newCellBorderStyle.getVerticalColor())) {
                 style = style.deriveBorderRight(newCellBorderStyle.getVerticalStyle(), newCellBorderStyle.getVerticalColor());
+            } else {
+                style = style.deriveBorderRight(cellBorderStyle.getVerticalStyle(), cellBorderStyle.getVerticalColor());
             }
         }
         if (tmpCellElement.getRow() == row) {
             if (cellBorderStyle.getTopStyle() != newCellBorderStyle.getTopStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getTopColor(), newCellBorderStyle.getTopColor())) {
                 style = style.deriveBorderTop(newCellBorderStyle.getTopStyle(), newCellBorderStyle.getTopColor());
+            } else {
+                style = style.deriveBorderTop(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor());
             }
         } else {
             if (cellBorderStyle.getHorizontalStyle() != newCellBorderStyle.getHorizontalStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getHorizontalColor(), newCellBorderStyle.getHorizontalColor())) {
                 style = style.deriveBorderTop(newCellBorderStyle.getHorizontalStyle(), newCellBorderStyle.getHorizontalColor());
+            } else {
+                style = style.deriveBorderTop(cellBorderStyle.getHorizontalStyle(), cellBorderStyle.getHorizontalColor());
             }
         }
         if (tmpCellElement.getRow() + tmpCellElement.getRowSpan() == row + rowSpan) {
             if (cellBorderStyle.getBottomStyle() != newCellBorderStyle.getBottomStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getBottomColor(), newCellBorderStyle.getBottomColor())) {
                 style = style.deriveBorderBottom(newCellBorderStyle.getBottomStyle(), newCellBorderStyle.getBottomColor());
+            } else {
+                style = style.deriveBorderBottom(cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor());
             }
         } else {
             if (cellBorderStyle.getHorizontalStyle() != newCellBorderStyle.getHorizontalStyle()
                     || !ComparatorUtils.equals(cellBorderStyle.getHorizontalColor(), newCellBorderStyle.getHorizontalColor())) {
                 style = style.deriveBorderBottom(newCellBorderStyle.getHorizontalStyle(), newCellBorderStyle.getHorizontalColor());
+            } else {
+                style = style.deriveBorderBottom(cellBorderStyle.getHorizontalStyle(), cellBorderStyle.getHorizontalColor());
             }
         }
         return style;