From d4b4b262d2f173b76e0d0ad0c80efc53b16e8f39 Mon Sep 17 00:00:00 2001 From: Yvan Date: Fri, 1 Apr 2022 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-68740=20=E3=80=90=E8=BF=AD=E4=BB=A3?= =?UTF-8?q?=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E6=95=B0=E6=8D=AE=E9=9B=86+?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=EF=BC=88=E4=B8=8D=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=89=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E5=AF=B9=E5=BA=94=E7=81=B0=E5=8C=96?= =?UTF-8?q?=20=E6=94=B9=E4=B8=80=E4=B8=8B=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/data/datapane/TableDataTree.java | 4 ++-- .../java/com/fr/design/data/datapane/TableDataTreePane.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java index 5e65c88a6..0c000f5af 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java @@ -287,7 +287,7 @@ public class TableDataTree extends UserObjectRefreshJTree { * 获得选中的数据集节点的NameObject的数组，只会返回数据集节点的NameObject * 当多选了数据集或数据列时，也只返回选中的数据集 */ - public NameObject[] getSelectedTableDataNodes() { + public NameObject[] getSelectedTableDataNameObjects() { Map> tableDataNodesAndColumnNodes = getSelectedTableDataNodesAndColumnNodes(); List tableDataNodes = tableDataNodesAndColumnNodes.get(TABLE_DATA_NODE); if (tableDataNodes == null) { @@ -333,7 +333,7 @@ public class TableDataTree extends UserObjectRefreshJTree { * @return */ public int getSelectedTableDataCounts() { - return getSelectedTableDataNodes().length; + return getSelectedTableDataNameObjects().length; } /** diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 7160e60ee..d8f0dbd8c 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -1012,7 +1012,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { @Override public void actionPerformed(ActionEvent e) { - NameObject[] selectedNameObjects = tableDataTree.getSelectedTableDataNodes(); + NameObject[] selectedNameObjects = tableDataTree.getSelectedTableDataNameObjects(); if (selectedNameObjects == null || selectedNameObjects.length == 0) { FineLoggerFactory.getLogger().error("Table Data to remove is null or not selected"); return; @@ -1076,7 +1076,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { @Override public void actionPerformed(ActionEvent e) { - NameObject[] selectedNameObjects = tableDataTree.getSelectedTableDataNodes(); + NameObject[] selectedNameObjects = tableDataTree.getSelectedTableDataNameObjects(); Map dataWrapperMap = TableDataTreeClipboard.getInstance().transferNameObjectArray2Map(selectedNameObjects); TableDataTreeClipboard.getInstance().addToClip(dataWrapperMap); }