Pull request #6508: REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0

* commit 'e1d8523c51cd572808cbd4b41df487117e92166c':
  REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null

designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java

@@ -106,6 +106,7 @@ public class CopyableJTable extends SortableJTable {
                     self.updateEndPoint(-1, column);
                     self.refreshTable();
                 }
+                self.requestFocusInWindow();
             }
 
             private int getColumn(MouseEvent e) {
@@ -249,14 +250,29 @@ public class CopyableJTable extends SortableJTable {
         FineLoggerFactory.getLogger().info("copy cell value");
         java.util.List<java.util.List<Object>> table = new ArrayList<>();
         if ((startRow != endRow || startCol != endCol) && Math.min(startCol, endCol) > -1) {
+            copyAreaData(table);
+        } else if (pointList.size() > 0) {
+            copyPointsData(table);
+        }
+
+        Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+        Transferable tText = new StringSelection(ClipboardHelper.formatExcelString(table));
+        clip.setContents(tText, null);
+    }
+
+    private void copyAreaData(java.util.List<java.util.List<Object>> table) {
         for (int i = Math.min(startRow, endRow); i <= Math.max(startRow, endRow); i++) {
             table.add(new ArrayList<>());
             for (int j = Math.min(startCol, endCol); j <= Math.max(startCol, endCol); j++) {
                 Object text = this.getTableValue(i, j);
+                if (text != null) {
                     table.get(table.size() - 1).add(text);
                 }
             }
-        } else if (pointList.size() > 0) {
+        }
+    }
+
+    private void copyPointsData(java.util.List<java.util.List<Object>> table) {
         Collections.sort(pointList, Comparator.comparing(Point::getX).thenComparing(Point::getY));
         int startRow = pointList.get(0).x;
         int currentRow = startRow;
@@ -267,13 +283,10 @@ public class CopyableJTable extends SortableJTable {
                 currentRow++;
             }
             Object text = this.getTableValue(point.x, point.y);
+            if (text != null) {
                 table.get(table.size() - 1).add(text);
             }
         }
-
-        Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
-        Transferable tText = new StringSelection(ClipboardHelper.formatExcelString(table));
-        clip.setContents(tText, null);
     }
 
     private Object getTableValue(int row, int col) {