From 77d58298d00c11ade8862ca8acb0fdef5a45322e Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 21 三月 2025 17:39:38 +0800 Subject: [PATCH] 修改 --- src/main/java/com/example/client/service/ImportLevel3Service.java | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/client/service/ImportLevel3Service.java b/src/main/java/com/example/client/service/ImportLevel3Service.java index b941bef..a685101 100644 --- a/src/main/java/com/example/client/service/ImportLevel3Service.java +++ b/src/main/java/com/example/client/service/ImportLevel3Service.java @@ -17,10 +17,7 @@ import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; +import java.awt.event.*; import java.io.File; import java.util.Date; import java.util.List; @@ -51,12 +48,19 @@ private String tmpPath; public void FileUpload(List<ColumnDto> columnDto, JTable subTable, JFrame jFrame) { - frame = new JFrame("瀵煎叆"); + frame = new JFrame("瀵煎叆涓夌骇缃戠粶鍥�"); frame.setSize(900, 600); frame.setResizable(true); frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); frame.setLocationRelativeTo(null); frame.setVisible(true); + frame.addWindowListener(new WindowAdapter() { + //娣诲姞绗簩涓晫闈㈢殑鍏抽棴浜嬩欢: + public void windowClosing(WindowEvent e) { + //娣诲姞浜嬩欢: + jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑 + } + }); GridBagLayout layout = new GridBagLayout(); frame.setLayout(layout); @@ -79,7 +83,7 @@ JLabel label0 = new JLabel("宸ョ▼"); JComboBox<JComboBoxItem> comboBox0 = new JComboBox<>(projectList); - JLabel label1 = new JLabel("浜岀骇缃戠粶鍥�"); + JLabel label1 = new JLabel("涓�绾х綉缁滃浘鑺傜偣"); JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(); comboBox1.setModel(new DefaultComboBoxModel<>(level2List)); @@ -89,7 +93,11 @@ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - setText(truncateText(value.toString(), 15)); // 鎴柇鏂囨湰 + if(value!=null){ + setText(truncateText(value.toString(), 15)); // 鎴柇鏂囨湰 + }else{ + setText(""); + } return this; } @@ -282,12 +290,13 @@ if (uploadSucceeded.equals("true")) { waitUtil.dispose(); frame.dispose(); + jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑 JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList(); JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null); JComboBoxItem[] cabinList = cabinService.getList(); String[] typeList = new String[]{ - "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�" - }; + "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�","" + }; List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null); CommonTable.refreshTable(list, columnDto, subTable); level3ManageService.tableModelListener(list, subTable, jFrame); -- Gitblit v1.9.1