From 0f732efdd482efbc8e07b490d508ef532a1adcda Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 17 Oct 2024 18:52:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/ui/debug/HeaderRenderer.java | 52 +++++++++++++++++++ .../ui/debug/RemoteDesignNetWorkAction.java | 6 ++- .../ui/debug/RemoteDesignNetWorkHelper.java | 5 ++ .../debug/RemoteDesignNetWorkTablePane.java | 5 +- .../RemoteDesignNetWorkTableRowSorter.java | 1 + .../ui/debug/SizeColorCellRenderer.java | 37 +++++++++++++ .../ui/debug/TimeColorCellRenderer.java | 38 ++++++++++++++ 7 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/remote/ui/debug/HeaderRenderer.java create mode 100644 designer-base/src/main/java/com/fr/design/remote/ui/debug/SizeColorCellRenderer.java create mode 100644 designer-base/src/main/java/com/fr/design/remote/ui/debug/TimeColorCellRenderer.java diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/HeaderRenderer.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/HeaderRenderer.java new file mode 100644 index 0000000000..8427f61062 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/HeaderRenderer.java @@ -0,0 +1,52 @@ +package com.fr.design.remote.ui.debug; + +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineTableHeaderUI; + +import javax.swing.Icon; +import javax.swing.JTable; +import javax.swing.RowSorter; +import javax.swing.SortOrder; +import java.awt.Component; + +/** + * 远程调试界面表头 + * + * @author vito + * @since 11.0 + * Created on 2024/10/17 + */ +public class HeaderRenderer extends FineTableHeaderUI.TableHeaderRenderer { + private final Icon ascendingIcon = new LazyIcon("sort_asc"); + private final Icon descendingIcon = new LazyIcon("sort_desc"); + private final Icon nosortIcon = new LazyIcon("nosort"); + + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, + int row, int col) { + super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, col); + + int modelColumn = table.convertColumnIndexToModel(col); + setIcon(null); + RemoteDesignNetWorkTableRowSorter sorter = (RemoteDesignNetWorkTableRowSorter) table.getRowSorter(); + + if (!sorter.isSortable(modelColumn)) { + return this; + } + SortOrder sortOrder = sorter.getSortKeys().stream() + .filter(key -> key.getColumn() == modelColumn) + .map(RowSorter.SortKey::getSortOrder) + .findFirst() + .orElse(null); + if (sortOrder == SortOrder.ASCENDING) { + setIcon(ascendingIcon); + } else if (sortOrder == SortOrder.DESCENDING) { + setIcon(descendingIcon); + } else { + setIcon(nosortIcon); + } + return this; + } +} diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkAction.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkAction.java index e0cfa2524e..337bcf3319 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkAction.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkAction.java @@ -8,13 +8,16 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.workspace.WorkContext; import javax.swing.JDialog; +import javax.swing.KeyStroke; import java.awt.Dimension; import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import static com.fine.theme.utils.FineUIScale.createScaleDimension; import static com.fine.theme.utils.FineUIScale.unscale; +import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; /** * 远程设计网络调试 @@ -27,7 +30,8 @@ public class RemoteDesignNetWorkAction extends UpdateAction { public static final String TITLE = "Remote Design NetWork"; public RemoteDesignNetWorkAction() { - setName(TITLE); + this.setName(TITLE); + this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, DEFAULT_MODIFIER)); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java index ba08291379..ba08d0586f 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java @@ -2,6 +2,8 @@ package com.fr.design.remote.ui.debug; import com.fr.stable.StringUtils; +import javax.swing.UIManager; +import java.awt.Color; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -14,6 +16,9 @@ import java.util.Date; * Created on 2024/10/11 */ public class RemoteDesignNetWorkHelper { + + static final Color DEFAULT_COLOR = UIManager.getColor("Table.foreground"); + private static final int UNIT = 1000; private static final int UNIT_BYTES = 1024; private static final String SECOND = "s"; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java index c29633aa5c..ab0ea82f98 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java @@ -86,7 +86,11 @@ public class RemoteDesignNetWorkTablePane extends JPanel { model.addColumn("request"); model.addColumn("response"); uiTable = new JTable(model); + uiTable.getColumnModel().getColumn(4).setCellRenderer(new TimeColorCellRenderer()); + uiTable.getColumnModel().getColumn(5).setCellRenderer(new SizeColorCellRenderer()); + uiTable.getColumnModel().getColumn(6).setCellRenderer(new SizeColorCellRenderer()); uiTable.setRowSorter(new RemoteDesignNetWorkTableRowSorter(model)); + uiTable.getTableHeader().setDefaultRenderer(new HeaderRenderer()); add(new JScrollPane(uiTable), BorderLayout.CENTER); } @@ -155,5 +159,4 @@ public class RemoteDesignNetWorkTablePane extends JPanel { } } - } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java index 231acc72c7..4f1270f1c7 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java @@ -19,6 +19,7 @@ public class RemoteDesignNetWorkTableRowSorter extends TableRowSorter SIZE_LARGE) { + setForeground(Color.RED); + } else if (parsed > SIZE_MIDDLE) { + setForeground(Color.ORANGE); + } else { + setForeground(DEFAULT_COLOR); + } + } + setText((value == null) ? "" : value.toString()); + } +} diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/TimeColorCellRenderer.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/TimeColorCellRenderer.java new file mode 100644 index 0000000000..7955fd0218 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/TimeColorCellRenderer.java @@ -0,0 +1,38 @@ +package com.fr.design.remote.ui.debug; + +import com.fine.theme.light.ui.FineTableHeaderUI; + +import java.awt.Color; + +import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.DEFAULT_COLOR; + +/** + * 时间多颜色渲染 + * + * @author vito + * @since 11.0 + * Created on 2024/10/16 + */ +public class TimeColorCellRenderer extends FineTableHeaderUI.TableRenderer { + + private static final int SIZE_MIDDLE = 1000; + private static final int SIZE_LARGE = 5000; + + + + @Override + protected void setValue(Object value) { + + if (value instanceof String) { + long parsed = RemoteDesignNetWorkHelper.parseCostToMS((String) value); + if (parsed > SIZE_LARGE) { + setForeground(Color.RED); + } else if (parsed > SIZE_MIDDLE) { + setForeground(Color.ORANGE); + } else { + setForeground(DEFAULT_COLOR); + } + } + setText((value == null) ? "" : value.toString()); + } +} From 83cbfaa3f49a65140553169c2089706e7d111418 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 17 Oct 2024 18:54:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=8D=E7=94=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fine/theme/light/ui/FineTableHeaderUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java index 8be32bb5cf..89a5e738ab 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java @@ -101,9 +101,9 @@ public class FineTableHeaderUI extends FlatTableHeaderUI { selectionBackground = UIManager.getColor("Table.background"); } setBackground(selectionBackground); - setText(value == null ? StringUtils.BLANK : String.valueOf(value)); setToolTipText(table, value, column); setBorder(border); + setValue(value); return this; }