diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellEditor.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellEditor.java index cf5058c..cc97de5 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellEditor.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellEditor.java @@ -56,12 +56,13 @@ public class OptButtonTableCellEditor extends BasicCellEditor implements ActionL public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { editor.setBackground(table.getSelectionBackground()); + editor.setOpaque(true); this.setBackground(table.getSelectionBackground()); this.value = value; if (editor instanceof JXHyperlink) { ((JXHyperlink) editor).setText(value + ""); } - if (hideCol != -1) { + if (hideCol != -1) { Object v = table.getValueAt(row, hideCol); editor.setVisible(!ObjectUtil.equal(v, hideValue)); } diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellRenderer.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellRenderer.java index ff6f33a..9615616 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellRenderer.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/components/table/renderer/OptButtonTableCellRenderer.java @@ -42,6 +42,7 @@ public class OptButtonTableCellRenderer extends DefaultTableCellRenderer { Object v = table.getValueAt(row, hideCol); this.component.setVisible(!ObjectUtil.equal(v, hideValue)); } + panel.setOpaque(isSelected); return panel; } diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dept/DeptManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dept/DeptManagementPanel.java index fd14b25..5566c27 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dept/DeptManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dept/DeptManagementPanel.java @@ -112,7 +112,7 @@ public class DeptManagementPanel extends JPanel implements Observer { treeTable.setClosedIcon(null); treeTable.setOpenIcon(null); treeTable.setShowHorizontalLines(true); - treeTable.setIntercellSpacing(new Dimension(1, 1)); + treeTable.setIntercellSpacing(new Dimension(0, 1)); treeTable.setOpaque(false); treeTable.setHighlighters(); ColorHighlighter rollover = new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, UIManager.getColor("App.hoverBackground"), null); @@ -137,6 +137,7 @@ public class DeptManagementPanel extends JPanel implements Observer { public void run() { ColorHighlighter rollover = new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, UIManager.getColor("App.hoverBackground"), null); treeTable.setHighlighters(rollover); + treeTable.setIntercellSpacing(new Dimension(0, 1)); } }); super.updateUI(); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/DictTypeManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/DictTypeManagementPanel.java index 9e5f3e5..9cbe150 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/DictTypeManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/DictTypeManagementPanel.java @@ -447,6 +447,7 @@ public class DictTypeManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/data/DictDataManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/data/DictDataManagementPanel.java index 259078b..5f4387b 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/data/DictDataManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/dict/data/DictDataManagementPanel.java @@ -409,6 +409,7 @@ public class DictDataManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/LoginlogManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/LoginlogManagementPanel.java index 64446ac..6baad83 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/LoginlogManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/LoginlogManagementPanel.java @@ -357,6 +357,7 @@ public class LoginlogManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/OperatelogManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/OperatelogManagementPanel.java index 575550d..7e8b04b 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/OperatelogManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/log/OperatelogManagementPanel.java @@ -380,6 +380,7 @@ public class OperatelogManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/menu/MenuManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/menu/MenuManagementPanel.java index 0591287..6da088c 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/menu/MenuManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/menu/MenuManagementPanel.java @@ -107,7 +107,8 @@ public class MenuManagementPanel extends JPanel implements Observer { treeTable.setClosedIcon(null); treeTable.setOpenIcon(null); treeTable.setShowHorizontalLines(true); - treeTable.setIntercellSpacing(new Dimension(1, 1)); + treeTable.setShowVerticalLines(false); + treeTable.setIntercellSpacing(new Dimension(0, 1)); treeTable.setOpaque(false); treeTable.setHighlighters(); // JXTable @@ -134,7 +135,7 @@ public class MenuManagementPanel extends JPanel implements Observer { public void run() { ColorHighlighter rollover = new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, UIManager.getColor("App.hoverBackground"), null); treeTable.setHighlighters(rollover); -// treeTable.setIntercellSpacing(new Dimension(0, 1)); + treeTable.setIntercellSpacing(new Dimension(0, 1)); // treeTable.setLeafIcon(null); // treeTable.setClosedIcon(null); // treeTable.setOpenIcon(null); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/notice/NoticeManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/notice/NoticeManagementPanel.java index 24e5ce7..190c786 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/notice/NoticeManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/notice/NoticeManagementPanel.java @@ -417,6 +417,7 @@ public class NoticeManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/post/PostManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/post/PostManagementPanel.java index ab4496d..83fe8cf 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/post/PostManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/post/PostManagementPanel.java @@ -399,6 +399,7 @@ public class PostManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/role/RoleManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/role/RoleManagementPanel.java index 12aa097..771f45e 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/role/RoleManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/role/RoleManagementPanel.java @@ -524,6 +524,7 @@ public class RoleManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/user/UserManagementPanel.java b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/user/UserManagementPanel.java index 9f10f7a..03dbcdc 100644 --- a/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/user/UserManagementPanel.java +++ b/dillon-ui/dillon-ui-swing/src/main/java/com/lw/swing/view/system/user/UserManagementPanel.java @@ -618,6 +618,7 @@ public class UserManagementPanel extends JPanel { label.setIcon(icon); panel.add(label); panel.setBackground(component.getBackground()); + panel.setOpaque(isSelected); return panel; } }); diff --git a/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/DarkTheme.properties b/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/DarkTheme.properties index a4a3de3..3dbbf65 100644 --- a/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/DarkTheme.properties +++ b/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/DarkTheme.properties @@ -88,7 +88,7 @@ defaultFont=14 TableHeader.height=40 -TableHeader.separatorColor = #fff0 +#TableHeader.separatorColor = #fff TableHeader.background = lighten(@background,6%,derived) Table.showHorizontalLines=true diff --git a/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/LightTheme.properties b/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/LightTheme.properties index 46d3479..fb37c9e 100644 --- a/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/LightTheme.properties +++ b/dillon-ui/dillon-ui-swing/src/main/resources/com/lw/swing/theme/LightTheme.properties @@ -84,6 +84,7 @@ Button.arc = 10 Table.selectionBackground = #e6ecff TableHeader.separatorColor = $App.borderColor +TableHeader.background = darken(@background,8%) TableHeader.height = 40 Table.rowHeight = 40 Table.cellFocusColor= #e6ecff