From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/Level1ViewService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/client/service/Level1ViewService.java b/src/main/java/com/example/client/service/Level1ViewService.java
index 282e15b..f2535c4 100644
--- a/src/main/java/com/example/client/service/Level1ViewService.java
+++ b/src/main/java/com/example/client/service/Level1ViewService.java
@@ -41,10 +41,11 @@
private NetWorkDiagramService netWorkDiagramService;
public JPanel createTable(Integer width, Integer height, JFrame frame) {
- height = height - 100;
- JPanel panel = new JPanel();
+ JPanel panel = new JPanel(new BorderLayout());
+ panel.setPreferredSize(new Dimension(width, height));
- JPanel jLeft = new JPanel(new BorderLayout());
+
+ JPanel jLeft = new JPanel();
jLeft.setPreferredSize(new Dimension(width / 4 - 20, Compute.ComputeHeight(0, frame)));
JPanel diagram = new JPanel(new BorderLayout());
@@ -56,6 +57,10 @@
List<DjJdgzNetworkLevel1> list = level1Service.getList(null);
//columnDto.add(new ColumnDto("ID", "id", -1, null,false));
+ if (list == null || list.size() == 0) {
+ JOptionPane.showMessageDialog(null, "杩樻湭褰曞叆涓�绾х綉缁滃浘鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return null;
+ }
columnDto.add(new ColumnDto("搴忓彿", "", width / 8 - 10, "autoCreate", false, null, null));
columnDto.add(new ColumnDto("宸ョ▼", "ProjectName", width / 8, null, false, null, null));
@@ -66,12 +71,12 @@
JScrollPane scrollTable = new JScrollPane(subTable);
scrollTable.setPreferredSize(new Dimension(width / 4 - 20, Compute.ComputeHeightWithScroll(0, frame)));
- jLeft.add(scrollTable, BorderLayout.CENTER);
+ jLeft.add(scrollTable);
frame.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent e) {
- jLeft.setPreferredSize(new Dimension(width / 4 - 20, Compute.ComputeHeight(40, frame)));
- scrollTable.setPreferredSize(new Dimension(width / 4 - 20, Compute.ComputeHeightWithScroll(40, frame)));
+ jLeft.setPreferredSize(new Dimension(width / 4 - 20, Compute.ComputeHeight(0, frame)));
+ scrollTable.setPreferredSize(new Dimension(width / 4 - 20, Compute.ComputeHeightWithScroll(0, frame)));
jLeft.revalidate();
jLeft.repaint();
scrollTable.revalidate();
@@ -95,7 +100,7 @@
String json = list.get(0).getContent();
List<NetworkNodeStatusDto> nodeStatusList = level1Service.getNodeStatusData(list.get(0).getId());
- graph = netWorkDiagramService.getCsDiagram(graph, json, nodeStatusList, diagram.getPreferredSize().width, diagram.getPreferredSize().height);
+ graph = netWorkDiagramService.getCsDiagram(graph, json, nodeStatusList, diagram.getPreferredSize().width, diagram.getPreferredSize().height,null);
mxGraphComponent graphComponent = new mxGraphComponent(graph);
graphComponent.setConnectable(false);
@@ -124,7 +129,7 @@
int r = subTable.getSelectedRow();
DjJdgzNetworkLevel1 data = list.get(r);
List<NetworkNodeStatusDto> nodeStatusList = level1Service.getNodeStatusData(data.getId());
- mxGraph csDiagram = netWorkDiagramService.getCsDiagram(graph2[0], data.getContent(), nodeStatusList, diagram.getPreferredSize().width, diagram.getPreferredSize().height);
+ mxGraph csDiagram = netWorkDiagramService.getCsDiagram(graph2[0], data.getContent(), nodeStatusList, diagram.getPreferredSize().width, diagram.getPreferredSize().height,null);
if (nodeStatusList != null && nodeStatusList.size() > 0) {
graph2[0] = csDiagram;
} else {
--
Gitblit v1.9.1