Browse Source
* commit '6dfdccc9fded8006f811b611c2cd6e6087bd4732': REPORT-135687 新增调试界面-远程网络信息 REPORT-135499 fix:fbp回归问题：超级链接-移动端弹窗布局调整fbp/feature
superman
2 months ago
7 changed files with 255 additions and 79 deletions
@ -0,0 +1,51 @@ |
|||||||
|
package com.fr.design.mainframe.toolbar; |
||||||
|
|
||||||
|
import com.fanruan.gui.UiInspector; |
||||||
|
import com.fine.theme.light.ui.laf.FineDarkLaf; |
||||||
|
import com.fine.theme.light.ui.laf.FineLightLaf; |
||||||
|
import com.fr.design.actions.UpdateAction; |
||||||
|
import com.fr.design.gui.UILookAndFeel; |
||||||
|
import com.fr.design.mainframe.DesignerContext; |
||||||
|
import com.fr.design.menu.MenuDef; |
||||||
|
import com.fr.design.remote.ui.debug.RemoteDesignNetWorkAction; |
||||||
|
|
||||||
|
import java.awt.event.ActionEvent; |
||||||
|
|
||||||
|
/** |
||||||
|
* 调试模式菜单 |
||||||
|
* |
||||||
|
* @author vito |
||||||
|
* @since 11.0 |
||||||
|
* Created on 2024/9/24 |
||||||
|
*/ |
||||||
|
public class DebugModeMenuDef extends MenuDef { |
||||||
|
|
||||||
|
public DebugModeMenuDef() { |
||||||
|
super("Debug"); |
||||||
|
addLookAndFeelMenu(); |
||||||
|
addRemotePane(); |
||||||
|
} |
||||||
|
|
||||||
|
private void addUIInspect() { |
||||||
|
this.addShortCut(new UpdateAction() { |
||||||
|
@Override |
||||||
|
public void actionPerformed(ActionEvent e) { |
||||||
|
new UiInspector().showInspector(DesignerContext.getDesignerFrame()); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
private void addLookAndFeelMenu() { |
||||||
|
MenuDef lookAndFeel = new MenuDef("Look And Feel", 'L'); |
||||||
|
lookAndFeel.addShortCut( |
||||||
|
new LookAndFeelAction(new FineLightLaf()), |
||||||
|
new LookAndFeelAction(new FineDarkLaf()), |
||||||
|
new LookAndFeelAction(new UILookAndFeel()) |
||||||
|
); |
||||||
|
this.addShortCut(lookAndFeel); |
||||||
|
} |
||||||
|
|
||||||
|
private void addRemotePane() { |
||||||
|
this.addShortCut(new RemoteDesignNetWorkAction()); |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,46 @@ |
|||||||
|
package com.fr.design.remote.ui.debug; |
||||||
|
|
||||||
|
import com.fine.theme.utils.FineUIScale; |
||||||
|
import com.fr.design.actions.UpdateAction; |
||||||
|
import com.fr.design.mainframe.DesignerContext; |
||||||
|
import com.fr.design.mainframe.DesignerFrame; |
||||||
|
import com.fr.design.utils.gui.GUICoreUtils; |
||||||
|
import com.fr.workspace.WorkContext; |
||||||
|
|
||||||
|
import javax.swing.JDialog; |
||||||
|
import java.awt.Dimension; |
||||||
|
import java.awt.event.ActionEvent; |
||||||
|
|
||||||
|
/** |
||||||
|
* 远程设计网络调试 |
||||||
|
* |
||||||
|
* @author vito |
||||||
|
* @since 11.0 |
||||||
|
* Created on 2024/9/24 |
||||||
|
*/ |
||||||
|
public class RemoteDesignNetWorkAction extends UpdateAction { |
||||||
|
public static final String TITLE = "Remote Design NetWork"; |
||||||
|
|
||||||
|
public RemoteDesignNetWorkAction() { |
||||||
|
setName(TITLE); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void actionPerformed(ActionEvent e) { |
||||||
|
if (WorkContext.getCurrent().isLocal()) { |
||||||
|
return; |
||||||
|
} |
||||||
|
JDialog jDialog = new JDialog(DesignerContext.getDesignerFrame(), TITLE); |
||||||
|
jDialog.setSize(calculatePaneDimension()); |
||||||
|
jDialog.add(new RemoteDesignNetWorkTablePane()); |
||||||
|
GUICoreUtils.centerWindow(jDialog); |
||||||
|
jDialog.setVisible(true); |
||||||
|
} |
||||||
|
|
||||||
|
private static Dimension calculatePaneDimension() { |
||||||
|
DesignerFrame parent = DesignerContext.getDesignerFrame(); |
||||||
|
return new Dimension((int) (FineUIScale.unscale(parent.getWidth()) * 0.8), |
||||||
|
(int) (FineUIScale.unscale(parent.getHeight()) * 0.6)); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
@ -0,0 +1,109 @@ |
|||||||
|
package com.fr.design.remote.ui.debug; |
||||||
|
|
||||||
|
import com.fanruan.workplace.http.debug.RequestInfo; |
||||||
|
import com.formdev.flatlaf.util.ScaledEmptyBorder; |
||||||
|
import com.fr.event.Event; |
||||||
|
import com.fr.event.EventDispatcher; |
||||||
|
import com.fr.event.Listener; |
||||||
|
import com.fr.workspace.WorkContext; |
||||||
|
|
||||||
|
import javax.swing.JPanel; |
||||||
|
import javax.swing.JScrollPane; |
||||||
|
import javax.swing.JTable; |
||||||
|
import javax.swing.table.DefaultTableModel; |
||||||
|
import javax.swing.table.TableCellRenderer; |
||||||
|
import javax.swing.table.TableColumn; |
||||||
|
import java.awt.BorderLayout; |
||||||
|
import java.awt.Component; |
||||||
|
import java.text.DecimalFormat; |
||||||
|
import java.text.SimpleDateFormat; |
||||||
|
import java.util.Date; |
||||||
|
|
||||||
|
import static com.fanruan.workplace.http.debug.RemoteDesignDebugEvent.REMOTE_HTTP_REQUEST; |
||||||
|
|
||||||
|
/** |
||||||
|
* 远程设计网络调试面板 |
||||||
|
* |
||||||
|
* @author vito |
||||||
|
* @since 11.0 |
||||||
|
* Created on 2024/9/24 |
||||||
|
*/ |
||||||
|
public class RemoteDesignNetWorkTablePane extends JPanel { |
||||||
|
private static final int K = 1024; |
||||||
|
private static final int TWO = 2; |
||||||
|
private JTable uiTable; |
||||||
|
private DefaultTableModel model; |
||||||
|
|
||||||
|
public RemoteDesignNetWorkTablePane() { |
||||||
|
setLayout(new BorderLayout()); |
||||||
|
setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); |
||||||
|
initComponent(); |
||||||
|
initListener(); |
||||||
|
} |
||||||
|
|
||||||
|
private void initComponent() { |
||||||
|
model = new DefaultTableModel(); |
||||||
|
model.addColumn("status"); |
||||||
|
model.addColumn("time"); |
||||||
|
model.addColumn("path"); |
||||||
|
model.addColumn("cost"); |
||||||
|
model.addColumn("request size"); |
||||||
|
model.addColumn("response size"); |
||||||
|
model.addColumn("request"); |
||||||
|
model.addColumn("response"); |
||||||
|
uiTable = new JTable(model); |
||||||
|
add(new JScrollPane(uiTable), BorderLayout.CENTER); |
||||||
|
} |
||||||
|
|
||||||
|
private void initListener() { |
||||||
|
EventDispatcher.listen(REMOTE_HTTP_REQUEST, new Listener<RequestInfo>() { |
||||||
|
@Override |
||||||
|
public void on(Event event, RequestInfo requestInfo) { |
||||||
|
model.addRow(new Object[]{ |
||||||
|
requestInfo.getStatus(), |
||||||
|
dateFormat(requestInfo.getDate()), |
||||||
|
requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), |
||||||
|
requestInfo.getConsume() + "ms", |
||||||
|
simpleSize(requestInfo.getRequestSize()), |
||||||
|
simpleSize(requestInfo.getResponseSize()), |
||||||
|
requestInfo.getSendBody(), |
||||||
|
requestInfo.getReturnBody(), |
||||||
|
}); |
||||||
|
adjustColumnWidths(uiTable); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
private static void adjustColumnWidths(JTable table) { |
||||||
|
for (int column = 0; column < table.getColumnCount() - TWO; column++) { |
||||||
|
TableColumn tableColumn = table.getColumnModel().getColumn(column); |
||||||
|
int preferredWidth = 20; |
||||||
|
int maxWidth = tableColumn.getMaxWidth(); |
||||||
|
tableColumn.setMinWidth(0); |
||||||
|
// 从最后一行来调整大小
|
||||||
|
int row = table.getRowCount() - 1; |
||||||
|
TableCellRenderer cellRenderer = table.getCellRenderer(row, column); |
||||||
|
Component component = table.prepareRenderer(cellRenderer, row, column); |
||||||
|
int width = component.getPreferredSize().width + table.getIntercellSpacing().width; |
||||||
|
preferredWidth = Math.max(preferredWidth, Math.min(width, maxWidth)); |
||||||
|
tableColumn.setPreferredWidth(preferredWidth); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
private static String dateFormat(Date date) { |
||||||
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
||||||
|
return dateFormat.format(date); |
||||||
|
} |
||||||
|
|
||||||
|
private static String simpleSize(long bytes) { |
||||||
|
if (bytes < 0) { |
||||||
|
return bytes + ""; |
||||||
|
} else if (bytes < K) { |
||||||
|
return bytes + " B"; |
||||||
|
} else { |
||||||
|
DecimalFormat df = new DecimalFormat("#.00"); |
||||||
|
return df.format((float) bytes / K) + " K"; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue