REPORT-44961 修改一些变量名，删去无用导包

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

@@ -7,7 +7,6 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
-import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.utils.DesignUtils;
 import com.fr.general.ComparatorUtils;

designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@@ -197,21 +197,24 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
                     if (!namelist.isEmpty()) {
                         columnNames = namelist.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
                     } else {
-                        columnNames = new String[]{""};
+                        columnNames = new String[]{StringUtils.EMPTY};
                     }
-                    ColumnNameEditor columnNameEditor1 = new ColumnNameEditor(columnNames);
-                    columnNameEditor1.addItemListener(itemListener);
-                    ColumnIndexEditor columnIndexEditor1 = new ColumnIndexEditor(columnNames.length);
-                    columnIndexEditor1.addItemListener(itemListener);
-                    keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNames[0]);
+                    // 实际值列名
+                    ColumnNameEditor actualColumnNameEditor = new ColumnNameEditor(columnNames);
+                    actualColumnNameEditor.addItemListener(itemListener);
+                    // 实际值列序号
+                    ColumnIndexEditor actualColumnIndexEditor = new ColumnIndexEditor(columnNames.length);
+                    actualColumnIndexEditor.addItemListener(itemListener);
+                    keyColumnPane.setEditors(new Editor[]{actualColumnNameEditor, actualColumnIndexEditor}, columnNames[0]);
 
                     localFormulaEditor.setEnabled(true);
-
-                    ColumnNameEditor columnNameEditor2 = new ColumnNameEditor(columnNames);
-                    columnNameEditor2.addItemListener(itemListener);
-                    ColumnIndexEditor columnIndexEditor2 = new ColumnIndexEditor(columnNames.length);
-                    columnIndexEditor2.addItemListener(itemListener);
-                    valueDictPane.setEditors(new Editor[]{columnNameEditor2, columnIndexEditor2, localFormulaEditor}, columnNames[0]);
+                    // 显示值列名
+                    ColumnNameEditor displayColumnNameEditor = new ColumnNameEditor(columnNames);
+                    displayColumnNameEditor.addItemListener(itemListener);
+                    // 显示值列序号
+                    ColumnIndexEditor displayColumnIndexEditor = new ColumnIndexEditor(columnNames.length);
+                    displayColumnIndexEditor.addItemListener(itemListener);
+                    valueDictPane.setEditors(new Editor[]{displayColumnNameEditor, displayColumnIndexEditor, localFormulaEditor}, columnNames[0]);
                 } catch (InterruptedException | ExecutionException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }