Browse Source

REPORT-97399

master
Mata.Li 6 years ago
parent
commit
c252a560ad
  1. 1
      designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
  2. 5
      designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java

1
designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

@ -5,7 +5,6 @@ package com.fr.design.gui.icombobox;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultComboBoxModel;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;

5
designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java

@ -9,7 +9,6 @@ import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icombobox.LazyComboBox; import com.fr.design.gui.icombobox.LazyComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
@ -234,9 +233,7 @@ public class SelectedDataColumnPane extends BasicPane {
DSColumn dsColumn = (DSColumn) value; DSColumn dsColumn = (DSColumn) value;
String dsName = dsColumn.getDSName(); String dsName = dsColumn.getDSName();
tableNameComboBox.setSelectedTableDataByName(dsName); tableNameComboBox.setSelectedTableDataByName(dsName);
//数据列名称 columnNameComboBox.setSelectedItem(TableDataColumn.getColumnName(dsColumn.getColumn()));
String dsColumnName = TableDataColumn.getColumnName(dsColumn.getColumn());
columnNameComboBox.setSelectedItem(dsColumnName);
ps = dsColumn.getParameters(); ps = dsColumn.getParameters();
addListener(); addListener();

Loading…
Cancel
Save