REPORT-98345 版本管理三期 表头支持排序

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.log.FineLoggerFactory;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
@@ -64,6 +65,20 @@ public abstract class UITableModelAdapter<T> extends AbstractTableModel implemen
 		return null;
 	}
 
+	/**
+	 * 获取映射后的值
+	 *
+	 * @param row 行
+	 * @return    值
+	 */
+	@Nullable
+	public T getConvertRowSelectedValue(int row) {
+		if (table.getSelectedRow() >= 0) {
+			return list.get(table.convertRowIndexToModel(row));
+		}
+		return null;
+	}
+
 	public void setColumnClass(Class<?>[] classes) {
 		this.classes = classes;
 	}

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java

@@ -19,6 +19,7 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTable;
+import javax.swing.RowSorter;
 import javax.swing.SwingConstants;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -26,6 +27,7 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.UIResource;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableRowSorter;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -151,6 +153,13 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
         tablePane.add(tableTopPane, BorderLayout.NORTH);
         tablePane.add(tableContentPane, BorderLayout.CENTER);
         tableContentPane.getEditTable().getColumnModel().getColumn(0).setMaxWidth(50);
+        RowSorter<UITableModelAdapter<T>> sorter = new TableRowSorter<UITableModelAdapter<T>>(model) {
+            @Override
+            public boolean isSortable(int column) {
+                return column != 0;
+            }
+        };
+        tableContentPane.getEditTable().setRowSorter(sorter);
         return tablePane;
     }
 
@@ -171,7 +180,7 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
                 int row = ((JTable) e.getSource()).rowAtPoint(e.getPoint());
                 int col = ((JTable) e.getSource()).columnAtPoint(e.getPoint());
                 if (col == 0) {
-                    T entity = model.getSelectedValue();
+                    T entity = model.getConvertRowSelectedValue(row);
                     //改变面板的各个状态
                     changeComponentStatus(entity, row, col, table);
                 }