From 64c2f7adda84419d18bba146673b0165b6060280 Mon Sep 17 00:00:00 2001
From: lemon <Zongyu.Wang@fanruan.com>
Date: Fri, 13 Sep 2024 15:07:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabledatapane/EmbeddedTableDataPane.java  | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
index 75501b1495..8d2798ae62 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
@@ -161,32 +161,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 		coordinatelabel = new UILabel("0/0,0/0");
 		coordinatelabel.setHorizontalAlignment(UILabel.CENTER);
         // 表结构设置
-        UIButton columnSetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Table_Design"));
-        columnSetButton.setMnemonic('C');
-
-        columnSetButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent evt) {
-
-                final EmbeddedTableModel localDefaultModel = (EmbeddedTableModel) dataJTable.getModel();
-                final EmbeddedTableDataDefinedPane columnSetPane = new EmbeddedTableDataDefinedPane();
-                columnSetPane.populate(((EmbeddedTableModel) dataJTable.getModel()).getEditableTableData());
-
-                DialogActionAdapter l = new DialogActionAdapter() {
-                    public void doOk() {
-                        localDefaultModel.setEditableTableData(columnSetPane.update());
-                        localDefaultModel.fireTableStructureChanged();
-                        localDefaultModel.fireTableDataChanged();
-                        tableStructureChanged();
-                        selectedChanged();
-						adjustTableAutoResizeMode();
-						dataJTable.repaint();
-                    }
-                };
-                BasicDialog dlg = columnSetPane.showWindow(DesignerContext.getDesignerFrame(), l);
-                dlg.setAlwaysOnTop(true);
-                dlg.setVisible(true);
-            }
-        });
+        UIButton columnSetButton = initColumnSetButton();
 
         // DataSourceEditor-Insert_Row
         insertRowButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"));
@@ -217,6 +192,35 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 		).getComponent();
     }
 
+	private UIButton initColumnSetButton() {
+		UIButton columnSetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Table_Design"));
+		columnSetButton.setMnemonic('C');
+		columnSetButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+
+				final EmbeddedTableModel localDefaultModel = (EmbeddedTableModel) dataJTable.getModel();
+				final EmbeddedTableDataDefinedPane columnSetPane = new EmbeddedTableDataDefinedPane();
+				columnSetPane.populate(((EmbeddedTableModel) dataJTable.getModel()).getEditableTableData());
+
+				DialogActionAdapter l = new DialogActionAdapter() {
+					public void doOk() {
+						localDefaultModel.setEditableTableData(columnSetPane.update());
+						localDefaultModel.fireTableStructureChanged();
+						localDefaultModel.fireTableDataChanged();
+						tableStructureChanged();
+						selectedChanged();
+						adjustTableAutoResizeMode();
+						dataJTable.repaint();
+					}
+				};
+				BasicDialog dlg = columnSetPane.showWindow(DesignerContext.getDesignerFrame(), l);
+				dlg.setAlwaysOnTop(true);
+				dlg.setVisible(true);
+			}
+		});
+		return columnSetButton;
+	}
+
 	/**
 	 * 更新按钮状态
 	 */