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

designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java

@@ -84,6 +84,16 @@ public class FineTableHeaderUI extends FlatTableHeaderUI {
             setHorizontalAlignment(SwingConstants.LEFT);
         }
 
+        /**
+         * 是否选中修改背景
+         * @param isSelected 被选中
+         * @param columnClass 列类型
+         * @return 是否修改
+         */
+        public boolean checkSelected(boolean isSelected, Class columnClass) {
+            return isSelected && columnClass != Boolean.class;
+        }
+
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
             Class<?> columnClass = table.getColumnClass(0);
@@ -95,7 +105,7 @@ public class FineTableHeaderUI extends FlatTableHeaderUI {
                 border = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")),
                         UIManager.getBorder("Table.cellNoFocusBorder"));
             }
-            if (isSelected && columnClass != Boolean.class) {
+            if (checkSelected(isSelected, columnClass)) {
                 selectionBackground = UIManager.getColor( "Table.selectionBackground");
             } else {
                 selectionBackground = UIManager.getColor("Table.background");

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

@@ -1220,6 +1220,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
             return this;
         }
+
+        @Override
+        public boolean checkSelected(boolean isSelected, Class columnClass) {
+            return isSelected;
+        }
     }
 
     /*
@@ -1245,6 +1250,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
             return this;
         }
+
+        @Override
+        public boolean checkSelected(boolean isSelected, Class columnClass) {
+            return isSelected;
+        }
     }
 
     /**
@@ -1263,7 +1273,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             setSelected((value != null && ((Boolean) value).booleanValue()));
             setUI(getUICheckBoxUI());
             setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
-            setBackground(Color.WHITE);
+            if (isSelected) {
+                setBackground(UIManager.getColor( "Table.selectionBackground"));
+            } else {
+                setBackground(UIManager.getColor("Table.background"));
+            }
             return this;
         }
     }

designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@@ -580,6 +580,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 
                 return this;
             }
+
+            @Override
+            public boolean checkSelected(boolean isSelected, Class columnClass) {
+                return isSelected;
+            }
         }
 
         private class ColumnRowGroupCellRenderer2 extends FineTableHeaderUI.TableRenderer {
@@ -613,6 +618,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 
                 return this;
             }
+
+            @Override
+            public boolean checkSelected(boolean isSelected, Class columnClass) {
+                return isSelected;
+            }
         }
     }
 }